From 2c59fdf5926cbdb314db188e8a1d483757fd2874 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Thu, 11 Nov 2021 20:21:31 +0200
Subject: [PATCH] setup Sentry envs

---
 .env.development        | 4 ++--
 .env.prod               | 4 ++--
 .env.test               | 2 +-
 .gitlab-ci.yml          | 2 +-
 Dockerfile              | 2 ++
 sentry.client.config.js | 2 ++
 sentry.server.config.js | 2 ++
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index ecf4164..54ea330 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-NEXT_DEPLOY_ENV=development
-; NEXT_SENTRY_DSN=
+NEXT_PUBLIC_DEPLOY_ENV=development
+NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885
 NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api
 NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
diff --git a/.env.prod b/.env.prod
index 3a4096f..f0723ea 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,4 +1,4 @@
-NEXT_DEPLOY_ENV=production
-; NEXT_SENTRY_DSN=
+NEXT_PUBLIC_DEPLOY_ENV=production
+NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885
 NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api
 NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi
diff --git a/.env.test b/.env.test
index d02c73b..c9cf145 100644
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,3 @@
-NEXT_DEPLOY_ENV=test
+NEXT_PUBLIC_DEPLOY_ENV=test
 NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api
 NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bcc61f..5d2dc55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ publish:dev:
   script:
     - docker info
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build . -t "$IMAGE_NAME":latest --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
+    - docker build . -t "$IMAGE_NAME":latest --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
     - docker push "$IMAGE_NAME":latest
 
 publish:prod:
diff --git a/Dockerfile b/Dockerfile
index 6314468..4b32e2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,8 @@ COPY . .
 COPY --from=deps /app/node_modules ./node_modules
 
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885
+ARG NEXT_PUBLIC_DEPLOY_ENV=production
 ARG NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api
 ARG NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi
 RUN npm run build
diff --git a/sentry.client.config.js b/sentry.client.config.js
index d480b2d..d3c5e27 100644
--- a/sentry.client.config.js
+++ b/sentry.client.config.js
@@ -5,9 +5,11 @@
 import * as Sentry from "@sentry/nextjs";
 
 const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
+const ENV = process.env.NEXT_PUBLIC_DEPLOY_ENV;
 
 Sentry.init({
   dsn: SENTRY_DSN,
+  environment: ENV,
   // Adjust this value in production, or use tracesSampler for greater control
   tracesSampleRate: 1.0,
   // ...
diff --git a/sentry.server.config.js b/sentry.server.config.js
index a7e581b..5d46ddc 100644
--- a/sentry.server.config.js
+++ b/sentry.server.config.js
@@ -5,9 +5,11 @@
 import * as Sentry from "@sentry/nextjs";
 
 const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
+const ENV = process.env.NEXT_PUBLIC_DEPLOY_ENV;
 
 Sentry.init({
   dsn: SENTRY_DSN,
+  environment: ENV,
   // Adjust this value in production, or use tracesSampler for greater control
   tracesSampleRate: 1.0,
   // ...