feat: enhance Docker and CI/CD configurations, add environment variable handling, and update dependencies

tacxou · tacxou · commit ded24bb24f3a · 2025-12-03T16:58:14.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,88 @@
+# Dependencies
 node_modules/
+.pnp
+.pnp.js
+
+# Build outputs
 .turbo/
 dist/
-.env
-.nuxt/
 .output/
+.nuxt/
+apps/*/dist/
+apps/*/.output/
+apps/*/.nuxt/
+
+# Environment files
+.env
+.env.*
+!.env.example
+
+# Git
+.git/
+.gitignore
+.gitattributes
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+
+# Logs
+logs/
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Testing
+coverage/
+.nyc_output/
+*.test.ts
+*.spec.ts
+**/__tests__/
+**/__mocks__/
+*.test.js
+*.spec.js
+
+# Documentation
+*.md
+!README.md
+docs/
+CHANGELOG.md
+LICENSE
+
+# Docker
+Dockerfile*
+docker-compose*.yml
+.dockerignore
+
+# Development files
+.prettierrc*
+.eslintrc*
+.editorconfig
+tsconfig*.json
+jest.config.*
+vitest.config.*
+*.config.ts
+*.config.js
+!nuxt.config.ts
+
+# Cache
+.cache/
+.temp/
+tmp/
+*.cache
+
+# Misc
+.husky/
+.commitlintrc*
+.nvmrc
+.node-version
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -40,6 +40,12 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Extract version and commit info
+        id: version
+        run: |
+          echo "version=$(jq -r .version package.json)" >> $GITHUB_OUTPUT
+          echo "build_id=${{ github.sha }}" >> $GITHUB_OUTPUT
+
       - name: Build and push Docker image
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
@@ -48,3 +54,5 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64
+          build-args: |
+            BUILD_VERSION=${{ steps.version.outputs.version }}-${{ steps.version.outputs.build_id }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,3 +42,4 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           access_token: ${{ secrets.GITHUB_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          build-args: BUILD_VERSION={{NEW_VERSION}}
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,9 @@ RUN yarn run build
 FROM node:22-alpine AS production
 
 ARG NODE_ENV=production
+ARG BUILD_VERSION=dev
 ENV NODE_ENV=${NODE_ENV}
+ENV BUILD_VERSION=${BUILD_VERSION}
 ENV ALLOW_RUNTIME_BUILD=true
 ENV DO_NOT_TRACK=1
 ENV PYTHONWARNINGS=ignore::UserWarning
@@ -36,9 +38,8 @@ RUN apk add --no-cache \
   git \
   jq \
   bash \
-  nano
-
-RUN mkdir -p /var/log/supervisor
+  nano && \
+  mkdir -p /var/log/supervisor
 
 RUN ARCH=$(uname -m) && \
   if [ "$ARCH" = "x86_64" ]; then \
@@ -53,7 +54,16 @@ RUN yarn install \
   --prefer-offline \
   --pure-lockfile \
   --non-interactive \
-  --production=false
+  --production=true && \
+  yarn cache clean && \
+  find /data/node_modules -name "*.md" -delete && \
+  find /data/node_modules -name "*.map" -delete && \
+  find /data/node_modules -name "*.ts" -not -path "*/node_modules/@types/*" -delete && \
+  find /data/node_modules -type d -name "__tests__" -exec rm -rf {} + 2>/dev/null || true && \
+  find /data/node_modules -type d -name "test" -exec rm -rf {} + 2>/dev/null || true && \
+  find /data/node_modules -type d -name "tests" -exec rm -rf {} + 2>/dev/null || true && \
+  find /data/node_modules -type d -name "docs" -exec rm -rf {} + 2>/dev/null || true && \
+  rm -rf /tmp/* /var/cache/apk/* /root/.npm /root/.node-gyp
 
 COPY --from=builder /data/apps/api/dist ./apps/api/dist
 COPY --from=builder /data/apps/api/configs ./apps/api/configs
diff --git a/apps/web/nuxt.config.ts b/apps/web/nuxt.config.ts
@@ -262,14 +262,14 @@ export default defineNuxtConfig({
         console.debug('[Nuxt] Error while reading identities-columns.yml', error)
       }
 
-      console.log('[OpenapiTS] Generating .nuxt/types/service-api.d.ts...')
-      try {
-        const fileData = await openapiTS(`${SESAME_APP_API_URL}/swagger/json`)
-        writeFileSync('.nuxt/types/service-api.d.ts', String(fileData))
-        console.log('[OpenapiTS] Generated .nuxt/types/service-api.d.ts !')
-      } catch (error) {
-        console.debug('[OpenapiTS] Error while generating .nuxt/types/service-api.d.ts', error)
-      }
+      // console.log('[OpenapiTS] Generating .nuxt/types/service-api.d.ts...')
+      // try {
+      //   const fileData = await openapiTS(`${SESAME_APP_API_URL}/swagger/json`)
+      //   writeFileSync('.nuxt/types/service-api.d.ts', String(fileData))
+      //   console.log('[OpenapiTS] Generated .nuxt/types/service-api.d.ts !')
+      // } catch (error) {
+      //   console.debug('[OpenapiTS] Error while generating .nuxt/types/service-api.d.ts', error)
+      // }
     },
   },
 })
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -29,22 +29,32 @@
     "@sentry/nuxt": "^10.25.0",
     "@sentry/profiling-node": "^10.26.0",
     "@vueuse/router": "^13.9.0",
+    "@vueuse/core": "^10.7.2",
+    "@vueuse/nuxt": "^10.7.2",
     "ajv": "^8.17.1",
     "ajv-errors": "^3.0.0",
     "ajv-i18n": "^4.2.0",
     "cookie": "^1.0.2",
+    "dayjs-nuxt": "^2.1.11",
     "fast-password-entropy": "^1.1.1",
     "hibp": "^15.0.1",
     "moment": "^2.30.1",
     "monaco-editor": "^0.53.0",
+    "nuxt": "^3.16.0",
+    "nuxt-monaco-editor": "^1.4.0",
+    "nuxt-quasar-ui": "^2.1.13",
     "openapi-fetch": "^0.14.0",
     "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "quasar": "^2.18.2",
     "radash": "^12.1.1",
     "reconnecting-eventsource": "^1.6.4",
     "sass": "^1.92.1",
+    "typescript": "^5.9.2",
+    "vite-plugin-pug": "^0.4.1",
+    "vue": "^3.4.14",
     "vue-eslint-parser": "^10.2.0",
+    "vue-router": "^4.2.5",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
@@ -54,20 +64,10 @@
     "@typescript-eslint/eslint-plugin": "^8.43.0",
     "@typescript-eslint/parser": "^8.43.0",
     "@vue/language-plugin-pug": "^1.8.27",
-    "@vueuse/core": "^10.7.2",
-    "@vueuse/nuxt": "^10.7.2",
-    "dayjs-nuxt": "^2.1.11",
     "eslint": "^9.35.0",
     "memfs": "^4.39.0",
-    "nuxt": "^3.16.0",
-    "nuxt-monaco-editor": "^1.4.0",
-    "nuxt-quasar-ui": "^2.1.13",
     "openapi-typescript": "^7.9.1",
     "prettier": "^3.6.2",
-    "typescript": "^5.9.2",
-    "vite-plugin-pug": "^0.4.1",
-    "vue": "^3.4.14",
-    "vue-router": "^4.2.5",
     "vue-tsc": "^1.8.27"
   },
   "resolutions": {
diff --git a/apps/web/start.mjs b/apps/web/start.mjs
@@ -8,11 +8,11 @@ dotenv.config()
 
 function hashEnv() {
   const sum = createHash('sha256')
-  // Ne hasher que les variables SESAME et npm_ qui impactent le build
+  // Ne hasher que les variables SESAME et npm_ qui impactent le build + BUILD_VERSION
   const env = Object.fromEntries(Object.entries(process.env).filter(
-    ([key]) => key.startsWith('SESAME_') || key.startsWith('npm_')
+    ([key]) => key.startsWith('SESAME_') || key.startsWith('npm_') || key === 'BUILD_VERSION'
   ))
-  // console.log('env', env)
+  console.log('env', env)
   sum.update(JSON.stringify(env))
   return sum.digest('hex')
 }
@@ -62,7 +62,7 @@ function buildNuxt() {
     }
   }
 
-  if (hashEnv() !== readHash()) {
+  if (process.env.ALLOW_RUNTIME_BUILD === 'true' && hashEnv() !== readHash()) {
     consola.warn('Hash changed, rebuilding...')
     consola.info(`Hash: ${hashEnv()}, Previous: ${readHash()}`)
     await buildNuxt()
