ENVIRON_PATH is a mandatory environment variable + small fixes

openzim · Sep 27, 2023 · 592c2b5 · 592c2b5
1 parent 84f4a04
commit 592c2b5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
@@ -45,7 +45,6 @@ services:
     build:
       dockerfile: ../../dev/frontend-ui-dev/Dockerfile
       context: ../dispatcher/frontend-ui
-    # build: ../dispatcher/frontend-ui
     container_name: zf_frontend-ui-dev
     volumes:
       - ../dispatcher/frontend-ui/src:/app/src

diff --git a/dev/frontend-ui-dev/Dockerfile b/dev/frontend-ui-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN yarn install && yarn cache clean
 COPY *.js /app/
 COPY public /app/public
 COPY src /app/src
-#CMD ["sleep", "infinity"]
 ENV ENVIRON_PATH /app/public/environ.json
 ENTRYPOINT [ "entrypoint.sh" ]
 CMD ["yarn", "serve", "--host", "0.0.0.0", "--port", "80"]
diff --git a/dispatcher/frontend-ui/Dockerfile b/dispatcher/frontend-ui/Dockerfile
@@ -20,6 +20,7 @@ COPY nginx-default.conf /etc/nginx/conf.d/default.conf
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 ENV ZIMFARM_WEBAPI https://api.farm.openzim.org/v1
+ENV ENVIRON_PATH /usr/share/nginx/html/environ.json
 EXPOSE 80
 
 ENTRYPOINT ["entrypoint.sh"]

diff --git a/dispatcher/frontend-ui/entrypoint.sh b/dispatcher/frontend-ui/entrypoint.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-if [ -z "${ENVIRON_PATH}" ]
-then
-    ENVIRON_PATH=/usr/share/nginx/html/environ.json
-fi
 echo "dump ZIMFARM_* environ variables to $ENVIRON_PATH"
 
 python3 -c 'import os; import json; print(json.dumps({k: v for k, v in os.environ.items() if k.startswith("ZIMFARM_")}, indent=4))' > $ENVIRON_PATH