From 4f7cbe5b67ec2a50ad3cfd7f00745c5198f593e6 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Wed, 20 Jun 2018 16:33:43 +0200 Subject: [PATCH] Get rid of h5ai (as Filerun works) --- Dockerfiles/h5ai/Dockerfile | 20 ----------------- Dockerfiles/h5ai/h5ai-path.patch | 13 ----------- Dockerfiles/h5ai/h5ai.nginx.conf | 13 ----------- Dockerfiles/h5ai/supervisord.conf | 8 ------- build-all.sh | 1 - docker-compose.yml | 36 +------------------------------ push-images.sh | 3 +-- 7 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 Dockerfiles/h5ai/Dockerfile delete mode 100644 Dockerfiles/h5ai/h5ai-path.patch delete mode 100644 Dockerfiles/h5ai/h5ai.nginx.conf delete mode 100644 Dockerfiles/h5ai/supervisord.conf diff --git a/Dockerfiles/h5ai/Dockerfile b/Dockerfiles/h5ai/Dockerfile deleted file mode 100644 index d703e6d..0000000 --- a/Dockerfiles/h5ai/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Jean Froment - -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 \ No newline at end of file diff --git a/Dockerfiles/h5ai/h5ai-path.patch b/Dockerfiles/h5ai/h5ai-path.patch deleted file mode 100644 index 37f4376..0000000 --- a/Dockerfiles/h5ai/h5ai-path.patch +++ /dev/null @@ -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)); \ No newline at end of file diff --git a/Dockerfiles/h5ai/h5ai.nginx.conf b/Dockerfiles/h5ai/h5ai.nginx.conf deleted file mode 100644 index a8f9d69..0000000 --- a/Dockerfiles/h5ai/h5ai.nginx.conf +++ /dev/null @@ -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; - } - } -} \ No newline at end of file diff --git a/Dockerfiles/h5ai/supervisord.conf b/Dockerfiles/h5ai/supervisord.conf deleted file mode 100644 index 92648c8..0000000 --- a/Dockerfiles/h5ai/supervisord.conf +++ /dev/null @@ -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;" \ No newline at end of file diff --git a/build-all.sh b/build-all.sh index 3c2d369..ddc81c1 100755 --- a/build-all.sh +++ b/build-all.sh @@ -23,6 +23,5 @@ while getopts ":nq" opt; do done docker build -t fromenje/seedbox:plex $ARGS Dockerfiles/plex & -docker build -t fromenje/seedbox:h5ai $ARGS Dockerfiles/h5ai & wait diff --git a/docker-compose.yml b/docker-compose.yml index 92e7e09..c4099bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: ports: - "80:80" - "443:443" - - "8080:8080" + #- "8080:8080" volumes: - /var/run/docker.sock:/var/run/docker.sock - ./traefik.toml:/traefik.toml @@ -37,23 +37,6 @@ services: - 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}' - '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: image: mariadb:10.1 restart: always @@ -64,8 +47,6 @@ services: MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_DATABASE: filerun - #volumes: - # - /data/config/filerun/db:/var/lib/mysql labels: - 'traefik.enable=false' @@ -94,16 +75,6 @@ services: - 'traefik.frontend.auth.basic=${HTTP_USER}:${HTTP_PASSWORD}' - 'traefik.enable=true' - # owncloud: - # image: owncloud:latest - # restart: always - # volumes: - # - torrents:/var/www/html/data/admin/files - # networks: - # - main - # ports: - # - "7474:80" - plex: image: fromenje/seedbox:plex build: Dockerfiles/plex @@ -155,7 +126,6 @@ services: volumes: - configsonarr:/config - torrents:/torrents - - tvshows:/tv - downloads:/downloads - /etc/localtime:/etc/localtime:ro environment: @@ -296,10 +266,6 @@ volumes: driver: local-persist driver_opts: mountpoint: /data/torrents/Movies - tvshows: - driver: local-persist - driver_opts: - mountpoint: /data/torrents/TV\ Shows downloads: driver: local-persist driver_opts: diff --git a/push-images.sh b/push-images.sh index cc82134..3fdac19 100755 --- a/push-images.sh +++ b/push-images.sh @@ -2,5 +2,4 @@ # Push all images to the docker registry. -docker push fromenje/seedbox:plex -docker push fromenje/seedbox:h5ai +docker push fromenje/seedbox:plex \ No newline at end of file