front: fill git describe using vite instead of import-meta-env

Signed-off-by: Florian Amsallem <[email protected]>
OpenRailAssociation · Jan 15, 2025 · 884d2ae · 884d2ae
1 parent 32128d8
commit 884d2ae
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 165 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,6 +68,8 @@ services:
       additional_contexts:
         test_data: tests/data
         static_assets: assets
+      args:
+        OSRD_GIT_DESCRIBE: development
     environment:
       # Actual values in ./docker/osrdyne.yml (please maintain consistency)
       # Provided here only for reuse in compose layers and doc
@@ -90,7 +92,7 @@ services:
         test_data: tests/data
       dockerfile: docker/Dockerfile.${OSRD_FRONT_MODE-devel}
       args:
-        OSRD_GIT_DESCRIBE: ${OSRD_GIT_DESCRIBE}
+        OSRD_GIT_DESCRIBE: development
     environment:
       FRONT_PORT: 3000 # only useful with the prod config
       OSRD_EDITOAST_URL: /api
@@ -120,6 +122,7 @@ services:
         static_assets: assets
       args:
         CARGO_PROFILE: dev
+        OSRD_GIT_DESCRIBE: development
     restart: unless-stopped
     ports: [ "8090:80" ]
     environment:

diff --git a/front/.env.example b/front/.env.example
diff --git a/front/docker/Dockerfile.devel b/front/docker/Dockerfile.devel
@@ -16,6 +16,10 @@ COPY --from=exec_as_builder /exec-as /
 
 WORKDIR /app
 
+# Fill build time values
+ARG OSRD_GIT_DESCRIBE
+ENV VITE_OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
+
 # Start the app
 COPY docker/dev-entrypoint.sh /
 ENTRYPOINT ["/dev-entrypoint.sh"]

diff --git a/front/docker/Dockerfile.nginx b/front/docker/Dockerfile.nginx
@@ -4,10 +4,15 @@ FROM node:20-bookworm AS build
 
 WORKDIR /app
 
+
 # Build dependencies
 COPY package.json package-lock.json /app/
 RUN npm install --frozen-lockfile
 
+# Fill build time values
+ARG OSRD_GIT_DESCRIBE
+ENV VITE_OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
+
 # Generate the licenses file and build
 COPY . /app
 RUN npm run generate-licenses && npm run build
@@ -23,18 +28,11 @@ COPY --from=test_data . /tests/data
 
 FROM nginx:alpine
 
-RUN apk add npm && \
-    npm install -g @import-meta-env/cli && \
-    rm /etc/nginx/conf.d/default.conf
-
+RUN rm /etc/nginx/conf.d/default.conf
 COPY docker/nginx.conf /etc/nginx/conf.d
 COPY docker/nginx-entrypoint.sh /entrypoint.sh
 
 COPY --from=build /app/build /srv
-COPY --from=build /app/.env.example /
-
-ARG OSRD_GIT_DESCRIBE
-ENV OSRD_GIT_DESCRIBE=${OSRD_GIT_DESCRIBE}
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["sh", "-c", "npx import-meta-env -x /.env.example -p /srv/index.html && exec nginx -g 'daemon off;'"]
+CMD ["nginx", "-g", "daemon off"]