Skip to content

Commit 34b5ae3

Browse files
Merge pull request #48 from datum-cloud/chore/add-sentry
Add Sentry and update to stable nextjs
2 parents 4af4d07 + c0f1dba commit 34b5ae3

26 files changed

Lines changed: 1809 additions & 261 deletions

.github/workflows/build-authui.yml

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
build-and-push:
14+
environment: ${{ github.event_name == 'release' && 'production' || 'staging' }}
1415
permissions:
1516
contents: read
1617
packages: write
@@ -20,50 +21,52 @@ jobs:
2021
runs-on: ubuntu-latest
2122

2223
steps:
23-
- name: Checkout repository
24-
uses: actions/checkout@v4
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
2526

26-
- name: Log in to GitHub Container Registry
27-
uses: docker/login-action@v3.4.0
28-
with:
29-
registry: ghcr.io
30-
username: ${{ github.actor }}
31-
password: ${{ secrets.GITHUB_TOKEN }}
27+
- name: Log in to GitHub Container Registry
28+
uses: docker/login-action@v3.4.0
29+
with:
30+
registry: ghcr.io
31+
username: ${{ github.actor }}
32+
password: ${{ secrets.GITHUB_TOKEN }}
3233

33-
- name: Extract metadata
34-
id: meta
35-
uses: docker/metadata-action@v5
36-
with:
37-
images: ghcr.io/datum-cloud/auth-ui
38-
tags: |
39-
type=ref,event=pr,suffix=-{{commit_date 'YYYYMMDD-HHmmss'}},prefix=v0.0.0-
40-
type=ref,event=pr,prefix=v0.0.0-
41-
type=ref,event=branch,suffix=-{{commit_date 'YYYYMMDD-HHmmss'}},prefix=v0.0.0-
42-
type=ref,event=branch,prefix=v0.0.0-
43-
type=semver,pattern=v{{version}}
44-
type=semver,pattern=v{{major}}.{{minor}}
45-
type=semver,pattern=v{{major}}
46-
type=sha,prefix=v0.0.0-
34+
- name: Extract metadata
35+
id: meta
36+
uses: docker/metadata-action@v5
37+
with:
38+
images: ghcr.io/datum-cloud/auth-ui
39+
tags: |
40+
type=ref,event=pr,suffix=-{{commit_date 'YYYYMMDD-HHmmss'}},prefix=v0.0.0-
41+
type=ref,event=pr,prefix=v0.0.0-
42+
type=ref,event=branch,suffix=-{{commit_date 'YYYYMMDD-HHmmss'}},prefix=v0.0.0-
43+
type=ref,event=branch,prefix=v0.0.0-
44+
type=semver,pattern=v{{version}}
45+
type=semver,pattern=v{{major}}.{{minor}}
46+
type=semver,pattern=v{{major}}
47+
type=sha,prefix=v0.0.0-
4748
48-
- name: Build Auth UI Docker image
49-
run: make login_standalone_build
49+
- name: Build Auth UI Docker image
50+
env:
51+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
52+
run: make login_standalone_build
53+
54+
- name: Tag and push image to GHCR
55+
env:
56+
TAGS: ${{ steps.meta.outputs.tags }}
57+
LABELS: ${{ steps.meta.outputs.labels }}
58+
IMAGE_VERSION: ${{ steps.meta.outputs.version }}
59+
run: |
60+
IMAGE="zitadel-login:${IMAGE_VERSION}"
61+
echo "Pushing $IMAGE with tags: $TAGS"
62+
# Convert tags (newline or comma separated) into space-separated list
63+
for TAG in $(echo "$TAGS" | tr '\n' ' '); do
64+
echo "Tagging $IMAGE as $TAG"
65+
docker tag "$IMAGE" "$TAG"
66+
echo "Pushing $TAG"
67+
docker push "$TAG"
68+
done
5069
51-
- name: Tag and push image to GHCR
52-
env:
53-
TAGS: ${{ steps.meta.outputs.tags }}
54-
LABELS: ${{ steps.meta.outputs.labels }}
55-
IMAGE_VERSION: ${{ steps.meta.outputs.version }}
56-
run: |
57-
IMAGE="zitadel-login:${IMAGE_VERSION}"
58-
echo "Pushing $IMAGE with tags: $TAGS"
59-
# Convert tags (newline or comma separated) into space-separated list
60-
for TAG in $(echo "$TAGS" | tr '\n' ' '); do
61-
echo "Tagging $IMAGE as $TAG"
62-
docker tag "$IMAGE" "$TAG"
63-
echo "Pushing $TAG"
64-
docker push "$TAG"
65-
done
66-
6770
publish-kustomize-bundles:
6871
# Add explicit dependency so that the kustomize bundles only get published
6972
# if the container image has been built successfully. This helps prevent
@@ -80,4 +83,4 @@ jobs:
8083
bundle-path: config
8184
image-overlays: config/base
8285
image-name: ghcr.io/datum-cloud/auth-ui
83-
secrets: inherit
86+
secrets: inherit

.github/workflows/test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ on:
44
workflow_dispatch:
55
inputs:
66
ignore-run-cache:
7-
description: 'Whether to ignore the run cache'
7+
description: "Whether to ignore the run cache"
88
required: false
9-
default: true
9+
default: "true"
1010
ref-tag:
11-
description: 'overwrite the DOCKER_METADATA_OUTPUT_VERSION environment variable used by the make file'
11+
description: "overwrite the DOCKER_METADATA_OUTPUT_VERSION environment variable used by the make file"
1212
required: false
13-
default: ''
1413
jobs:
1514
quality:
1615
name: Ensure Quality

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export GID := $(id -g)
1414
export LOGIN_TEST_ACCEPTANCE_BUILD_CONTEXT := $(LOGIN_DIR)apps/login-test-acceptance
1515

1616
export DOCKER_METADATA_OUTPUT_VERSION ?= local
17+
export SENTRY_AUTH_TOKEN ?=
1718
export LOGIN_TAG ?= zitadel-login:${DOCKER_METADATA_OUTPUT_VERSION}
1819
export LOGIN_TEST_UNIT_TAG := login-test-unit:${DOCKER_METADATA_OUTPUT_VERSION}
1920
export LOGIN_TEST_INTEGRATION_TAG := login-test-integration:${DOCKER_METADATA_OUTPUT_VERSION}
@@ -111,8 +112,8 @@ login_test_acceptance_setup_dev:
111112
@echo "Starting the login test acceptance environment with the local zitadel image"
112113
docker compose --file $(LOGIN_DIR)apps/login-test-acceptance/docker-compose.yaml up --no-recreate zitadel traefik sink
113114

114-
login_quality: login_lint login_test_unit login_test_integration
115-
@echo "Running login quality checks: lint, unit tests, integration tests"
115+
login_quality: login_lint login_test_unit
116+
@echo "Running login quality checks: lint, unit tests"
116117

117118
login_standalone_build:
118119
@echo "Building the login standalone docker image with tag: $(LOGIN_TAG)"

apps/login/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
custom-config.js
22
.env*.local
33
standalone
4+
5+
# Sentry Config File
6+
.env.sentry-build-plugin

apps/login/locales/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@
272272
"failedLoading": "Daten konnten nicht geladen werden. Bitte versuchen Sie es erneut.",
273273
"tryagain": "Erneut versuchen"
274274
}
275-
}
275+
}

apps/login/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,4 @@
282282
"failedLoading": "Failed to load data. Please try again.",
283283
"tryagain": "Try Again"
284284
}
285-
}
285+
}

apps/login/locales/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@
272272
"failedLoading": "No se pudieron cargar los datos. Por favor, inténtalo de nuevo.",
273273
"tryagain": "Intentar de nuevo"
274274
}
275-
}
275+
}

apps/login/locales/it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@
272272
"failedLoading": "Impossibile caricare i dati. Riprova.",
273273
"tryagain": "Riprova"
274274
}
275-
}
275+
}

apps/login/locales/pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@
272272
"failedLoading": "Nie udało się załadować danych. Spróbuj ponownie.",
273273
"tryagain": "Spróbuj ponownie"
274274
}
275-
}
275+
}

apps/login/locales/ru.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,4 @@
272272
"failedLoading": "Ошибка загрузки данных. Попробуйте ещё раз.",
273273
"tryagain": "Попробовать снова"
274274
}
275-
}
275+
}

0 commit comments

Comments
 (0)