From da46d12770fb1dc3a4cf410c1f5bc09410102835 Mon Sep 17 00:00:00 2001 From: Niall Maher Date: Sat, 18 Nov 2023 08:34:48 +0000 Subject: [PATCH] Infra cleanup after experiments --- Dockerfile | 8 +------- cdk/lib/app-stack.ts | 4 +--- cdk/lib/pipeline-stack.ts | 12 ++---------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33ff39a9..6cd6d565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,13 +27,7 @@ ENV NEXT_PUBLIC_SENTRY_DSN https://a0460f6abac067ae72754b23ccd03aac@o45058956182 RUN npx prisma generate -RUN --mount=type=secret,id=TEST_VALUE export TEST_VALUE=$(cat /run/secrets/TEST_VALUE) && \ - echo $TEST_VALUE - -RUN --mount=type=secret,id=SECRET_TIME export SECRET_TIME=$(cat /run/secrets/SECRET_TIME) && \ - echo $SECRET_TIME - -RUN --mount=type=secret,id=DATABASE_URL export DATABASE_URL=$(cat /run/secrets/DATABASE_URL) && \ +RUN --mount=type=secret,id=SENTRY_AUTH_TOKEN export SENTRY_AUTH_TOKEN=$(cat /run/secrets/SENTRY_AUTH_TOKEN) && \ npm run build # Production image, copy all the files and run next diff --git a/cdk/lib/app-stack.ts b/cdk/lib/app-stack.ts index 13d4587c..34c1e49b 100644 --- a/cdk/lib/app-stack.ts +++ b/cdk/lib/app-stack.ts @@ -41,9 +41,7 @@ export class AppStack extends cdk.Stack { directory: "../", file: "Dockerfile", buildSecrets: { - DATABASE_URL: "type=env", - TEST_VALUE: "type=env", - SECRET_TIME: "type=env", + SENTRY_AUTH_TOKEN: "type=env", }, buildArgs: { DOCKER_BUILDKIT: "1", diff --git a/cdk/lib/pipeline-stack.ts b/cdk/lib/pipeline-stack.ts index 4f39cebc..49860b3d 100644 --- a/cdk/lib/pipeline-stack.ts +++ b/cdk/lib/pipeline-stack.ts @@ -46,17 +46,9 @@ export class PipelineStack extends cdk.Stack { codeBuildDefaults: { buildEnvironment: { environmentVariables: { - DATABASE_URL: { + SENTRY_AUTH_TOKEN: { type: BuildEnvironmentVariableType.PARAMETER_STORE, - value: "/prod/db/url", - }, - TEST_VALUE: { - type: BuildEnvironmentVariableType.PLAINTEXT, - value: "TESTING MY PATIENCE", - }, - SECRET_TIME: { - type: BuildEnvironmentVariableType.PARAMETER_STORE, - value: "/prod/temp/test", + value: "sentry", }, }, },