chore: switch sentry to secret, remove args and git hash

bcgov · Jan 22, 2025 · d5a272e · d5a272e
1 parent 6c6e786
commit d5a272e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -64,9 +64,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        env:
-          GIT_HASH: ${{ env.GIT_HASH }}
-          SENTRY_AUTH_TOKEN: ${{ env.SENTRY_AUTH_TOKEN }}
         uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.context }}
@@ -75,9 +72,7 @@ jobs:
           file: ${{ matrix.dockerfile }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            SENTRY_AUTH_TOKEN=${{ env.SENTRY_AUTH_TOKEN }}
-            GIT_HASH=${{ env.GIT_HASH }}
+          secrets: 'sentry_token=${{ secrets.SENTRY_AUTH_TOKEN }}'
           cache-from: type=registry,ref=${{ matrix.image }}:buildcache
           cache-to: type=registry,ref=${{ matrix.image }}:buildcache,mode=max
           # cache-to: ${{ github.ref == 'refs/heads/main' && 'type=registry,ref=${{ matrix.image }}:buildcache,mode=max' || '' }}

diff --git a/app/Dockerfile b/app/Dockerfile
@@ -43,10 +43,7 @@ RUN yarn --frozen-lockfile
 # Build the app
 FROM base AS builder
 
-# ARG GIT_HASH
-# ARG SENTRY_AUTH_TOKEN
-# ENV GIT_HASH=${GIT_HASH}
-# ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
+RUN --mount=type=secret,id=sentry_token,env=SENTRY_AUTH_TOKEN
 
 # Copy node_modules from the deps stage
 COPY --from=deps ${APP_HOME}/node_modules ./node_modules

diff --git a/app/next.config.js b/app/next.config.js
@@ -45,9 +45,6 @@ const moduleExports = {
       language: 'typescript',
     },
   },
-  generateBuildId: async () => {
-    return 'latest';
-  },
 
   publicRuntimeConfig: {
     NEXT_PUBLIC_GROWTHBOOK_API_KEY: process.env.NEXT_PUBLIC_GROWTHBOOK_API_KEY,
@@ -93,12 +90,9 @@ module.exports = withSentryConfig(moduleExports, {
   // For all available options, see:
   // https://github.com/getsentry/sentry-webpack-plugin#options
 
-  // authToken: `${process.env.SENTRY_AUTH_TOKEN}`,
+  authToken: `${process.env.SENTRY_AUTH_TOKEN}`,
   org: 'bcgov-ccbc-yr',
   project: 'ccbc',
-  sourcemaps: {
-    disable: true,
-  },
 
   // Only print logs for uploading source maps in CI
   silent: !process.env.CI,