소스 검색

fix: New frontend ENV variables not available during build

Owen Diffey 1 년 전
부모
커밋
91e1950042
2개의 변경된 파일26개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 0
      docker-compose.yml
  2. 18 1
      frontend/Dockerfile

+ 8 - 0
docker-compose.yml

@@ -31,6 +31,14 @@ services:
       target: musare_frontend
       args:
         FRONTEND_MODE: "${FRONTEND_MODE:-production}"
+        FRONTEND_PROD_DEVTOOLS: "${FRONTEND_PROD_DEVTOOLS:-false}"
+        MUSARE_SITENAME: "${MUSARE_SITENAME:-Musare}"
+        MUSARE_DEBUG_VERSION: "${MUSARE_DEBUG_VERSION:-true}"
+        MUSARE_DEBUG_GIT_REMOTE: "${MUSARE_DEBUG_GIT_REMOTE:-false}"
+        MUSARE_DEBUG_GIT_REMOTE_URL: "${MUSARE_DEBUG_GIT_REMOTE_URL:-false}"
+        MUSARE_DEBUG_GIT_BRANCH: ${MUSARE_DEBUG_GIT_BRANCH:-true}
+        MUSARE_DEBUG_GIT_LATEST_COMMIT: "${MUSARE_DEBUG_GIT_LATEST_COMMIT:-true}"
+        MUSARE_DEBUG_GIT_LATEST_COMMIT_SHORT: "${MUSARE_DEBUG_GIT_LATEST_COMMIT_SHORT:-true}"
     restart: ${RESTART_POLICY:-unless-stopped}
     user: root
     ports:

+ 18 - 1
frontend/Dockerfile

@@ -11,7 +11,24 @@ RUN npm install --silent
 FROM node:18 AS musare_frontend
 
 ARG FRONTEND_MODE=production
-ENV FRONTEND_MODE=${FRONTEND_MODE}
+ARG FRONTEND_PROD_DEVTOOLS=false
+ARG MUSARE_SITENAME=Musare
+ARG MUSARE_DEBUG_VERSION=true
+ARG MUSARE_DEBUG_GIT_REMOTE=false
+ARG MUSARE_DEBUG_GIT_REMOTE_URL=false
+ARG MUSARE_DEBUG_GIT_BRANCH=true
+ARG MUSARE_DEBUG_GIT_LATEST_COMMIT=true
+ARG MUSARE_DEBUG_GIT_LATEST_COMMIT_SHORT=true
+
+ENV FRONTEND_MODE=${FRONTEND_MODE} \
+    FRONTEND_PROD_DEVTOOLS=${FRONTEND_PROD_DEVTOOLS} \
+    MUSARE_SITENAME=${MUSARE_SITENAME} \
+    MUSARE_DEBUG_VERSION=${MUSARE_DEBUG_VERSION} \
+    MUSARE_DEBUG_GIT_REMOTE=${MUSARE_DEBUG_GIT_REMOTE} \
+    MUSARE_DEBUG_GIT_REMOTE_URL=${MUSARE_DEBUG_GIT_REMOTE_URL} \
+    MUSARE_DEBUG_GIT_BRANCH=${MUSARE_DEBUG_GIT_BRANCH} \
+    MUSARE_DEBUG_GIT_LATEST_COMMIT=${MUSARE_DEBUG_GIT_LATEST_COMMIT} \
+    MUSARE_DEBUG_GIT_LATEST_COMMIT_SHORT=${MUSARE_DEBUG_GIT_LATEST_COMMIT_SHORT}
 
 RUN apt update && apt install nginx -y