diff --git a/Dockerfile b/Dockerfile index 0671814cdca6970fec1c36c3b6a2ab9a7a2d320e..cfcca9fe27167e64efc9a38ffc8b1a5808699f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM nginx:1.19-alpine +ARG TRANSMISSION # hadolint ignore=DL3018 RUN rm -rf /etc/nginx/conf./* && \ chmod 777 /run && \ @@ -24,6 +25,11 @@ RUN rm -rf /etc/nginx/conf./* && \ COPY www/ /var/www/ COPY conf.d/ /etc/nginx/conf.d/ COPY snippets/ /etc/nginx/snippets/ +# Another option would be to copy the file to the template directory and have +# the environment variable substitution happen in runtime, but that way would +# miss checking the syntax during the build process. +# hadolint ignore=SC2097,SC2098 +RUN TRANSMISSION=$TRANSMISSION sed -i "s/TRANSMISSION/$TRANSMISSION/" /etc/nginx/conf.d/www.shore.co.il.conf USER nginx RUN nginx -t HEALTHCHECK CMD curl --fail --verbose --user-agent 'Docker health check' http://localhost/ || exit 1 diff --git a/conf.d/www.shore.co.il.conf b/conf.d/www.shore.co.il.conf index ef07233cb270f80bdb55c7fe08b7da53d6a5dac7..bc9993a831e07b8a8ff59f794eb846a595bc518a 100644 --- a/conf.d/www.shore.co.il.conf +++ b/conf.d/www.shore.co.il.conf @@ -77,7 +77,7 @@ server { proxy_buffering off; } - location /d16ebf5287f85724083b0e20a9c300f3/ { + location /TRANSMISSION/ { proxy_pass http://kodi.shore.co.il:9091/; proxy_http_version 1.1; include snippets/proxy-headers.conf; diff --git a/docker-compose.yml b/docker-compose.yml index f60cc7522e4ede5e32e32028357032b2d3c89fa8..046d07ee5391daf5196555a1d5ee4690cc47c46c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,8 @@ version: '3.5' services: proxy: build: + args: + TRANSMISSION: "${TRANSMISSION}" context: ./ #command: ["nginx", "-g", "daemon off;"] hostname: &hostname www.shore.co.il