Get rid of h5ai (as Filerun works)
This commit is contained in:
parent
4fb1811bb1
commit
4f7cbe5b67
|
@ -1,20 +0,0 @@
|
||||||
FROM ubuntu:trusty
|
|
||||||
MAINTAINER Jean Froment <froment.je@gmail.com>
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y nginx php5-fpm supervisor wget unzip patch
|
|
||||||
|
|
||||||
# download latest release
|
|
||||||
RUN wget http:`(wget https://larsjung.de/h5ai/ -q -O -) | sed 's/.*href="\(.*\.zip\)".*/\1/p' | head -n1`
|
|
||||||
RUN unzip h5ai-*.zip -d /usr/share/h5ai
|
|
||||||
|
|
||||||
ADD h5ai.nginx.conf /etc/nginx/sites-available/default
|
|
||||||
|
|
||||||
VOLUME /torrents
|
|
||||||
|
|
||||||
ADD h5ai-path.patch patch
|
|
||||||
RUN patch -p1 -u -d /usr/share/h5ai/_h5ai/private/php/core/ -i /patch && rm patch
|
|
||||||
|
|
||||||
ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
|
||||||
CMD supervisord -c /etc/supervisor/conf.d/supervisord.conf
|
|
||||||
|
|
||||||
EXPOSE 12333
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/class-setup.php b/class-setup.php
|
|
||||||
index 8743dee..663c069 100644
|
|
||||||
--- a/class-setup.php
|
|
||||||
+++ b/class-setup.php
|
|
||||||
@@ -106,7 +106,7 @@ class Setup {
|
|
||||||
$this->set('H5AI_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false));
|
|
||||||
|
|
||||||
$this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('H5AI_HREF')), true));
|
|
||||||
- $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('H5AI_PATH')), false));
|
|
||||||
+ $this->set('ROOT_PATH', '/torrents');
|
|
||||||
|
|
||||||
$this->set('PUBLIC_HREF', Util::normalize_path($this->get('H5AI_HREF') . '/public/', true));
|
|
||||||
$this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/public/', false));
|
|
|
@ -1,13 +0,0 @@
|
||||||
server {
|
|
||||||
listen 12333;
|
|
||||||
root /torrents;
|
|
||||||
index /_h5ai/public/index.php;
|
|
||||||
try_files $uri $uri/ =404;
|
|
||||||
location /_h5ai/ {
|
|
||||||
root /usr/share/h5ai/;
|
|
||||||
location /_h5ai/public/index.php {
|
|
||||||
fastcgi_pass unix:/var/run/php5-fpm.sock;
|
|
||||||
include fastcgi_params;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
[supervisord]
|
|
||||||
nodaemon=true
|
|
||||||
|
|
||||||
[program:php5-fpm]
|
|
||||||
command=/usr/sbin/php5-fpm --nodaemonize
|
|
||||||
|
|
||||||
[program:nginx]
|
|
||||||
command=/usr/sbin/nginx -g "daemon off;"
|
|
|
@ -23,6 +23,5 @@ while getopts ":nq" opt; do
|
||||||
done
|
done
|
||||||
|
|
||||||
docker build -t fromenje/seedbox:plex $ARGS Dockerfiles/plex &
|
docker build -t fromenje/seedbox:plex $ARGS Dockerfiles/plex &
|
||||||
docker build -t fromenje/seedbox:h5ai $ARGS Dockerfiles/h5ai &
|
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
|
@ -11,7 +11,7 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
- "8080:8080"
|
#- "8080:8080"
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- ./traefik.toml:/traefik.toml
|
- ./traefik.toml:/traefik.toml
|
||||||
|
@ -37,23 +37,6 @@ services:
|
||||||
- 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}'
|
- 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}'
|
||||||
- 'traefik.enable=true'
|
- 'traefik.enable=true'
|
||||||
|
|
||||||
# h5ai:
|
|
||||||
# image: fromenje/seedbox:h5ai
|
|
||||||
# build: Dockerfiles/h5ai
|
|
||||||
# restart: always
|
|
||||||
# networks:
|
|
||||||
# - web
|
|
||||||
# volumes:
|
|
||||||
# - torrents:/torrents
|
|
||||||
# - config:/config
|
|
||||||
# labels:
|
|
||||||
# - 'traefik.backend=h5ai'
|
|
||||||
# - 'traefik.port=12333'
|
|
||||||
# - 'traefik.frontend.rule=Host:explore.${TRAEFIK_DOMAIN}'
|
|
||||||
# - 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}'
|
|
||||||
# - 'traefik.enable=true'
|
|
||||||
# - com.centurylinklabs.watchtower.enable=false
|
|
||||||
|
|
||||||
filerun-db:
|
filerun-db:
|
||||||
image: mariadb:10.1
|
image: mariadb:10.1
|
||||||
restart: always
|
restart: always
|
||||||
|
@ -64,8 +47,6 @@ services:
|
||||||
MYSQL_USER: ${MYSQL_USER}
|
MYSQL_USER: ${MYSQL_USER}
|
||||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||||
MYSQL_DATABASE: filerun
|
MYSQL_DATABASE: filerun
|
||||||
#volumes:
|
|
||||||
# - /data/config/filerun/db:/var/lib/mysql
|
|
||||||
labels:
|
labels:
|
||||||
- 'traefik.enable=false'
|
- 'traefik.enable=false'
|
||||||
|
|
||||||
|
@ -94,16 +75,6 @@ services:
|
||||||
- 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}'
|
- 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}'
|
||||||
- 'traefik.enable=true'
|
- 'traefik.enable=true'
|
||||||
|
|
||||||
# owncloud:
|
|
||||||
# image: owncloud:latest
|
|
||||||
# restart: always
|
|
||||||
# volumes:
|
|
||||||
# - torrents:/var/www/html/data/admin/files
|
|
||||||
# networks:
|
|
||||||
# - main
|
|
||||||
# ports:
|
|
||||||
# - "7474:80"
|
|
||||||
|
|
||||||
plex:
|
plex:
|
||||||
image: fromenje/seedbox:plex
|
image: fromenje/seedbox:plex
|
||||||
build: Dockerfiles/plex
|
build: Dockerfiles/plex
|
||||||
|
@ -155,7 +126,6 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- configsonarr:/config
|
- configsonarr:/config
|
||||||
- torrents:/torrents
|
- torrents:/torrents
|
||||||
- tvshows:/tv
|
|
||||||
- downloads:/downloads
|
- downloads:/downloads
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
environment:
|
environment:
|
||||||
|
@ -296,10 +266,6 @@ volumes:
|
||||||
driver: local-persist
|
driver: local-persist
|
||||||
driver_opts:
|
driver_opts:
|
||||||
mountpoint: /data/torrents/Movies
|
mountpoint: /data/torrents/Movies
|
||||||
tvshows:
|
|
||||||
driver: local-persist
|
|
||||||
driver_opts:
|
|
||||||
mountpoint: /data/torrents/TV\ Shows
|
|
||||||
downloads:
|
downloads:
|
||||||
driver: local-persist
|
driver: local-persist
|
||||||
driver_opts:
|
driver_opts:
|
||||||
|
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
# Push all images to the docker registry.
|
# Push all images to the docker registry.
|
||||||
|
|
||||||
docker push fromenje/seedbox:plex
|
docker push fromenje/seedbox:plex
|
||||||
docker push fromenje/seedbox:h5ai
|
|
Loading…
Reference in New Issue