From d42838ab37db03367e8d7ae1fc92351b0a130730 Mon Sep 17 00:00:00 2001 From: Kristian Haugene Date: Tue, 25 Aug 2020 10:06:07 +0200 Subject: [PATCH] Update arm Dockerfile to reflect latest changes #1341 --- Dockerfile.armhf | 85 +++--------------------------------------------- 1 file changed, 4 insertions(+), 81 deletions(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index de50bbc4d..67f98a3f5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -25,8 +25,6 @@ RUN apt-get update \ && apt-get purge git \ && apt-get autoremove --purge \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.0/dockerize-linux-armhf-v0.6.0.tar.gz \ - | tar -C /usr/local/bin -xzv \ && groupmod -g 1000 users \ && useradd -u 911 -U -d /config -s /bin/false abc \ && usermod -G users abc @@ -41,89 +39,14 @@ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ GLOBAL_APPLY_PERMISSIONS=true \ - TRANSMISSION_ALT_SPEED_DOWN=50 \ - TRANSMISSION_ALT_SPEED_ENABLED=false \ - TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \ - TRANSMISSION_ALT_SPEED_TIME_DAY=127 \ - TRANSMISSION_ALT_SPEED_TIME_ENABLED=false \ - TRANSMISSION_ALT_SPEED_TIME_END=1020 \ - TRANSMISSION_ALT_SPEED_UP=50 \ - TRANSMISSION_BIND_ADDRESS_IPV4=0.0.0.0 \ - TRANSMISSION_BIND_ADDRESS_IPV6=:: \ - TRANSMISSION_BLOCKLIST_ENABLED=false \ - TRANSMISSION_BLOCKLIST_URL=http://www.example.com/blocklist \ - TRANSMISSION_CACHE_SIZE_MB=4 \ - TRANSMISSION_DHT_ENABLED=true \ - TRANSMISSION_DOWNLOAD_DIR=/data/completed \ - TRANSMISSION_DOWNLOAD_LIMIT=100 \ - TRANSMISSION_DOWNLOAD_LIMIT_ENABLED=0 \ - TRANSMISSION_DOWNLOAD_QUEUE_ENABLED=true \ - TRANSMISSION_DOWNLOAD_QUEUE_SIZE=5 \ - TRANSMISSION_ENCRYPTION=1 \ - TRANSMISSION_IDLE_SEEDING_LIMIT=30 \ - TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED=false \ - TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \ - TRANSMISSION_INCOMPLETE_DIR_ENABLED=true \ - TRANSMISSION_LPD_ENABLED=false \ - TRANSMISSION_MAX_PEERS_GLOBAL=200 \ - TRANSMISSION_MESSAGE_LEVEL=2 \ - TRANSMISSION_PEER_CONGESTION_ALGORITHM= \ - TRANSMISSION_PEER_ID_TTL_HOURS=6 \ - TRANSMISSION_PEER_LIMIT_GLOBAL=200 \ - TRANSMISSION_PEER_LIMIT_PER_TORRENT=50 \ - TRANSMISSION_PEER_PORT=51413 \ - TRANSMISSION_PEER_PORT_RANDOM_HIGH=65535 \ - TRANSMISSION_PEER_PORT_RANDOM_LOW=49152 \ - TRANSMISSION_PEER_PORT_RANDOM_ON_START=false \ - TRANSMISSION_PEER_SOCKET_TOS=default \ - TRANSMISSION_PEX_ENABLED=true \ - TRANSMISSION_PORT_FORWARDING_ENABLED=false \ - TRANSMISSION_PREALLOCATION=1 \ - TRANSMISSION_PREFETCH_ENABLED=1 \ - TRANSMISSION_QUEUE_STALLED_ENABLED=true \ - TRANSMISSION_QUEUE_STALLED_MINUTES=30 \ - TRANSMISSION_RATIO_LIMIT=2 \ - TRANSMISSION_RATIO_LIMIT_ENABLED=false \ - TRANSMISSION_RENAME_PARTIAL_FILES=true \ - TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \ - TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \ - TRANSMISSION_RPC_ENABLED=true \ - TRANSMISSION_RPC_HOST_WHITELIST= \ - TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=false \ - TRANSMISSION_RPC_PASSWORD=password \ - TRANSMISSION_RPC_PORT=9091 \ - TRANSMISSION_RPC_URL=/transmission/ \ - TRANSMISSION_RPC_USERNAME=username \ - TRANSMISSION_RPC_WHITELIST=127.0.0.1 \ - TRANSMISSION_RPC_WHITELIST_ENABLED=false \ - TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED=true \ - TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED=false \ - TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME= \ - TRANSMISSION_SEED_QUEUE_ENABLED=false \ - TRANSMISSION_SEED_QUEUE_SIZE=10 \ - TRANSMISSION_SPEED_LIMIT_DOWN=100 \ - TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED=false \ - TRANSMISSION_SPEED_LIMIT_UP=100 \ - TRANSMISSION_SPEED_LIMIT_UP_ENABLED=false \ - TRANSMISSION_START_ADDED_TORRENTS=true \ - TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES=false \ - TRANSMISSION_UMASK=2 \ - TRANSMISSION_UPLOAD_LIMIT=100 \ - TRANSMISSION_UPLOAD_LIMIT_ENABLED=0 \ - TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT=14 \ - TRANSMISSION_UTP_ENABLED=false \ - TRANSMISSION_WATCH_DIR=/data/watch \ - TRANSMISSION_WATCH_DIR_ENABLED=true \ TRANSMISSION_HOME=/data/transmission-home \ - TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \ + CREATE_TUN_DEVICE=true \ ENABLE_UFW=false \ UFW_ALLOW_GW_NET=false \ UFW_EXTRA_PORTS= \ UFW_DISABLE_IPTABLES_REJECT=false \ - TRANSMISSION_WEB_UI=\ - PUID=\ - PGID=\ - TRANSMISSION_WEB_HOME= \ + PUID= \ + PGID= \ DROP_DEFAULT_ROUTE= \ WEBPROXY_ENABLED=false \ WEBPROXY_PORT=8888 \ @@ -132,7 +55,7 @@ ENV OPENVPN_USERNAME=**None** \ DOCKER_LOG=false \ HEALTH_CHECK_HOST=google.com -HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh +HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh # Expose port and run EXPOSE 9091