Skip to content

Commit

Permalink
sentry: add sourcemaps to frontend and print
Browse files Browse the repository at this point in the history
Add .cache/npm/sentry-cli to cache.
Add it with a .gitkeep file that the permissions are set correctly.
Move the .gitkeep instruction from e2e up to the top level .gitignore.
It may be that you need to delete your node_modules folders for frontend and print after this commit.
  • Loading branch information
BacLuc committed Aug 19, 2023
1 parent d774990 commit 9282fbd
Show file tree
Hide file tree
Showing 21 changed files with 662 additions and 20 deletions.
Empty file added .cache/npm/sentry-cli/.gitkeep
Empty file.
10 changes: 10 additions & 0 deletions .docker-hub/frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ RUN npm ci && npm run build

# frontend build stage
FROM node:lts-alpine AS frontend-build-stage
ARG SENTRY_AUTH_TOKEN
ARG SENTRY_ORG
ARG SENTRY_FRONTEND_PROJECT
ARG SENTRY_RELEASE_NAME

COPY common /common

Expand All @@ -23,6 +27,12 @@ RUN apk --no-cache add --virtual native-deps g++ make python3 git && npm ci && a
COPY frontend .
COPY --from=pdf-build-stage /pdf/dist ./src/pdf
COPY --from=pdf-build-stage /pdf/src/assets/fonts/Inter ./src/assets/fonts/Inter

ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
ENV SENTRY_ORG=$SENTRY_ORG
ENV SENTRY_FRONTEND_PROJECT=$SENTRY_FRONTEND_PROJECT
ENV SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME

RUN npm run build

# production stage
Expand Down
10 changes: 10 additions & 0 deletions .docker-hub/print/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
# build stage
FROM node:20.5.1 AS build-stage
ARG SENTRY_AUTH_TOKEN
ARG SENTRY_ORG
ARG SENTRY_PRINT_PROJECT
ARG SENTRY_RELEASE_NAME

COPY common /common

WORKDIR /app

COPY print/package*.json ./

ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
ENV SENTRY_ORG=$SENTRY_ORG
ENV SENTRY_PRINT_PROJECT=$SENTRY_PRINT_PROJECT
ENV SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME

RUN npm ci

COPY print .
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deployment-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
secrets:
DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

upgrade-or-install-deployment:
name: Upgrade or install deployment
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deployment-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
secrets:
DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

upgrade-or-install-deployment:
name: Upgrade or install deployment
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deployment-stage-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
secrets:
DOCKER_HUB_USERNAME: ${{ vars.DOCKER_HUB_USERNAME }}
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

upgrade-or-install-deployment:
name: Upgrade or install deployment
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/reusable-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
required: true
DOCKER_HUB_PASSWORD:
required: true
SENTRY_AUTH_TOKEN:

jobs:
build-and-push:
Expand Down Expand Up @@ -43,6 +44,11 @@ jobs:
${{ ((inputs.tag != '') && format('{0}/ecamp3-frontend:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-frontend:${{ inputs.sha }}
context: .
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG=${{ vars.SENTRY_ORG }}
SENTRY_FRONTEND_PROJECT=${{ vars.SENTRY_FRONTEND_PROJECT }}
SENTRY_RELEASE_NAME=${{ inputs.sha }}
cache-from: type=gha,scope=frontend
cache-to: type=gha,scope=frontend,mode=max

Expand Down Expand Up @@ -81,5 +87,10 @@ jobs:
${{ ((inputs.tag != '') && format('{0}/ecamp3-print:{1}', vars.DOCKER_HUB_USERNAME, inputs.tag) || '') }}
${{ vars.DOCKER_HUB_USERNAME }}/ecamp3-print:${{ inputs.sha }}
context: .
build-args: |
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG=${{ vars.SENTRY_ORG }}
SENTRY_PRINT_PROJECT=${{ vars.SENTRY_PRINT_PROJECT }}
SENTRY_RELEASE_NAME=${{ inputs.sha }}
cache-from: type=gha,scope=print
cache-to: type=gha,scope=print,mode=max
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
/.caddy/
/.env
/.helm/ecamp3/charts

!/**/.gitkeep
7 changes: 7 additions & 0 deletions .helm/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@ POSTGRES_ADMIN_URL=
BASIC_AUTH_ENABLED=false
BASIC_AUTH_USERNAME=test
BASIC_AUTH_PASSWORD=test

API_SENTRY_DSN=
FRONTEND_SENTRY_DSN=
PRINT_SENTRY_DSN=

SENTRY_AUTH_TOKEN=
SENTRY_RELEASE_NAME=$version
13 changes: 10 additions & 3 deletions .helm/build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,25 @@ if [ -z "$docker_hub_account" ] \
exit 1
fi

sentry_build_args="--build-arg SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN --build-arg SENTRY_ORG=$SENTRY_ORG"
sentry_build_args="$sentry_build_args --build-arg SENTRY_RELEASE_NAME=$SENTRY_RELEASE_NAME"

frontend_sentry_build_args="$sentry_build_args --build-arg SENTRY_FRONTEND_PROJECT=$SENTRY_FRONTEND_PROJECT"

frontend_image_tag="${docker_hub_account}/ecamp3-frontend:${version}"
docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/frontend/Dockerfile -t "$frontend_image_tag"
docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/frontend/Dockerfile $frontend_sentry_build_args -t "$frontend_image_tag"
docker push "$frontend_image_tag"

api_image_tag="${docker_hub_account}/ecamp3-api-php:${version}"
docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$api_image_tag" --target api_platform_php
docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$api_image_tag" --target api_platform_php $sentry_build_args
docker push "$api_image_tag"

caddy_image_tag="${docker_hub_account}/ecamp3-api-caddy:${version}"
docker build "$REPO_DIR"/api -f "$REPO_DIR"/api/Dockerfile -t "$caddy_image_tag" --target api_platform_caddy_prod
docker push "$caddy_image_tag"

print_sentry_build_args="$sentry_build_args --build-arg SENTRY_PRINT_PROJECT=$SENTRY_PRINT_PROJECT"

print_image_tag="${docker_hub_account}/ecamp3-print:${version}"
docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/print/Dockerfile -t "$print_image_tag"
docker build "$REPO_DIR" -f "$REPO_DIR"/.docker-hub/print/Dockerfile $print_sentry_build_args -t "$print_image_tag"
docker push "$print_image_tag"
12 changes: 9 additions & 3 deletions .helm/deploy-to-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ for i in 1; do
values="$values --set postgresql.dropDBOnUninstall=true"
values="$values --set php.dataMigrationsDir=$migrations_dir"
values="$values --set php.appSecret=$app_secret"
#values="$values --set php.sentryDsn=$API_SENTRY_DSN"
#values="$values --set frontend.sentryDsn=$FRONTEND_SENTRY_DSN"
#values="$values --set print.sentryDsn=$PRINT_SENTRY_DSN"
if [ -n "$API_SENTRY_DSN" ]; then
values="$values --set php.sentryDsn=$API_SENTRY_DSN"
fi
if [ -n "$FRONTEND_SENTRY_DSN" ]; then
values="$values --set frontend.sentryDsn=$FRONTEND_SENTRY_DSN"
fi
if [ -n "$PRINT_SENTRY_DSN" ]; then
values="$values --set print.sentryDsn=$PRINT_SENTRY_DSN"
fi
values="$values --set php.jwt.passphrase=$app_jwt_passphrase"
values="$values --set-file php.jwt.publicKey=$SCRIPT_DIR/public.pem"
values="$values --set-file php.jwt.privateKey=$SCRIPT_DIR/private.pem"
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- ./common:/common:delegated
- ./pdf:/pdf:delegated
- ./.cache/npm:/home/node/.npm/_cacache:delegated
- ./.cache/npm/sentry-cli:/home/node/.npm/sentry-cli:delegated
environment:
- NODE_ENV=development
- NPM_CONFIG_UPDATE_NOTIFIER=false
Expand Down Expand Up @@ -118,6 +119,7 @@ services:
- ./print:/app:delegated
- ./common:/common:delegated
- ./.cache/npm:/home/node/.npm/_cacache:delegated
- ./.cache/npm/sentry-cli:/home/node/.npm/sentry-cli:delegated
environment:
- NODE_OPTIONS=--openssl-legacy-provider #TODO: remove when we update to webpack >=5
- NUXT_HOST=0.0.0.0
Expand Down
2 changes: 0 additions & 2 deletions e2e/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ node_modules
/data
/dist

!/**/.gitkeep


/reports/
selenium-debug.log
Expand Down
3 changes: 3 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ yarn-error.log*
# yalc
.yalc
yalc.lock

# Sentry Auth Token
.env.sentry-build-plugin
Loading

0 comments on commit 9282fbd

Please sign in to comment.