From 87877cbcd0a5bc0cd46b67fb9d334ef8696bd34f Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:39:46 +0200 Subject: [PATCH 01/10] Fix version in package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 10aa651..a4fece5 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,13 @@ { "name": "oidc-test-web", - "version": "0.0.1", + "version": "0.2.4", "type": "module", "scripts": { "dev": "vite --port 3000", "build": "run-p type-check \"build-only {@}\" --", "preview": "vite preview", "build-only": "vite build", - "type-check": "vue-tsc --build", - "version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json" + "type-check": "vue-tsc --build" }, "dependencies": { "@dsb-norge/vue-keycloak-js": "^3.0.1", @@ -27,6 +26,7 @@ "vite-plugin-vue-devtools": "7.7.0", "vue-tsc": "2.2.0" }, + "packageManager": "pnpm@10.12.1", "publishConfig": { "registry": "http://code.philo.ydns.eu/api/packages/philorg/npm/" } From 4d1a8f00a5f0527e7a08701b2ed00ffe0135670d Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:39:55 +0200 Subject: [PATCH 02/10] 0.2.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15fe2e5..6709f0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.0.1", + "version": "0.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.0.1", + "version": "0.2.5", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index a4fece5..ecb8184 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-test-web", - "version": "0.2.4", + "version": "0.2.5", "type": "module", "scripts": { "dev": "vite --port 3000", From 81bc7ff07d5fcdb5bdd504d60fad9044f3706dc1 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:43:13 +0200 Subject: [PATCH 03/10] Use updated Containerfile --- Containerfile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index f5612bd..dc33d06 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,19 @@ -FROM docker.io/nginx:alpine +FROM docker.io/node:alpine as base -COPY ./dist /usr/share/nginx/html/oidc-test-web +ENV PNPM_HOME="/pnpm" +ENV PATH="$PNPM_HOME:$PATH" +RUN corepack enable -CMD ["nginx", "-g", "daemon off;"] + +FROM base as build-stage + +WORKDIR /app +COPY pnpm-lock.yaml . +RUN pnpm fetch --prod +COPY . . +RUN pnpm run build + +FROM docker.io/library/nginx:alpine as production-stage +RUN mkdir /app +COPY --from=build-stage /app/dist /app +COPY nginx.conf /etc/nginx/nginx.conf From 83ef820f44077181e359564238728263b8ba6895 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:43:22 +0200 Subject: [PATCH 04/10] 0.2.6 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6709f0d..f86d5e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.2.5", + "version": "0.2.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.2.5", + "version": "0.2.6", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index ecb8184..4be3ce6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-test-web", - "version": "0.2.5", + "version": "0.2.6", "type": "module", "scripts": { "dev": "vite --port 3000", From e23b71e11ce0516826b141b092c50e6e6ae49218 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:46:03 +0200 Subject: [PATCH 05/10] Fix Containerfile --- Containerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index dc33d06..7f769b9 100644 --- a/Containerfile +++ b/Containerfile @@ -15,5 +15,6 @@ RUN pnpm run build FROM docker.io/library/nginx:alpine as production-stage RUN mkdir /app -COPY --from=build-stage /app/dist /app -COPY nginx.conf /etc/nginx/nginx.conf +COPY --from=build-stage /usr/share/nginx/html/oidc-test-web + +CMD ["nginx", "-g", "daemon off;"] From b0f410bef0f3083787002733b125536f05de8834 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:46:08 +0200 Subject: [PATCH 06/10] 0.2.7 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f86d5e8..1d476fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.2.6", + "version": "0.2.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.2.6", + "version": "0.2.7", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index 4be3ce6..c0331d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-test-web", - "version": "0.2.6", + "version": "0.2.7", "type": "module", "scripts": { "dev": "vite --port 3000", From 1af2c2c6da8cb2f78a72234fa10bf40745266847 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:48:01 +0200 Subject: [PATCH 07/10] Fix Containerfile --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 7f769b9..acd663b 100644 --- a/Containerfile +++ b/Containerfile @@ -15,6 +15,6 @@ RUN pnpm run build FROM docker.io/library/nginx:alpine as production-stage RUN mkdir /app -COPY --from=build-stage /usr/share/nginx/html/oidc-test-web +COPY --from=build-stage /app/dist /usr/share/nginx/html/oidc-test-web CMD ["nginx", "-g", "daemon off;"] From b1e8946e961626bcb66754eaeae9f853c67536c3 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:48:06 +0200 Subject: [PATCH 08/10] 0.2.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d476fb..a861d04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.2.7", + "version": "0.2.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.2.7", + "version": "0.2.8", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index c0331d6..9cfdd8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-test-web", - "version": "0.2.7", + "version": "0.2.8", "type": "module", "scripts": { "dev": "vite --port 3000", From 5ec05120ace7868899afc110e333ec46f5c281f0 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:53:43 +0200 Subject: [PATCH 09/10] CI: Improve build --- .woodpecker/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 3a48e49..bb78fa7 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -12,6 +12,8 @@ steps: ORG: philorg REGISTRY_TOKEN: from_secret: registry_token + volumes: + - pnpm:/root/.local/share/pnpm commands: - pnpm install --frozen-lockfile - pnpm set "//code.philo.ydns.eu/api/packages/$ORG/npm/:_authToken=$REGISTRY_TOKEN" From 3673318b75082c29b6960aeca0ddcb25b5d08dcd Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 27 Jun 2025 17:53:58 +0200 Subject: [PATCH 10/10] 0.2.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a861d04..81c986b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.2.8", + "version": "0.2.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.2.8", + "version": "0.2.9", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index 9cfdd8d..65dcd88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-test-web", - "version": "0.2.8", + "version": "0.2.9", "type": "module", "scripts": { "dev": "vite --port 3000",