瀏覽代碼

Rebind PUBLIC_* env vars inside web container entrypoint (#1363)

bo0tzz 2 年之前
父節點
當前提交
8094b25185
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 0 4
      docker/docker-compose.yml
  2. 5 0
      web/entrypoint.sh

+ 0 - 4
docker/docker-compose.yml

@@ -51,10 +51,6 @@ services:
     entrypoint: ["/bin/sh", "./entrypoint.sh"]
     entrypoint: ["/bin/sh", "./entrypoint.sh"]
     env_file:
     env_file:
       - .env
       - .env
-    environment:
-      # Rename these values for svelte public interface
-      - PUBLIC_IMMICH_SERVER_URL=${IMMICH_SERVER_URL}
-      - PUBLIC_IMMICH_API_URL_EXTERNAL=${IMMICH_API_URL_EXTERNAL}
     restart: always
     restart: always
 
 
   redis:
   redis:

+ 5 - 0
web/entrypoint.sh

@@ -1,4 +1,9 @@
 #! /bin/sh
 #! /bin/sh
+
+# Rebind env vars to PUBLIC_ for svelte
+export PUBLIC_IMMICH_SERVER_URL=$IMMICH_SERVER_URL
+export PUBLIC_IMMICH_API_URL_EXTERNAL=$IMMICH_API_URL_EXTERNAL
+
 if [ "$(id -u)" -eq 0 ] && [ -n "$PUID" ] && [ -n "$PGID" ]; then
 if [ "$(id -u)" -eq 0 ] && [ -n "$PUID" ] && [ -n "$PGID" ]; then
     exec setpriv --reuid "$PUID" --regid "$PGID" --clear-groups node /usr/src/app/build/index.js
     exec setpriv --reuid "$PUID" --regid "$PGID" --clear-groups node /usr/src/app/build/index.js
 else
 else