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" diff --git a/Containerfile b/Containerfile index f5612bd..acd663b 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,20 @@ -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 + + +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 /usr/share/nginx/html/oidc-test-web CMD ["nginx", "-g", "daemon off;"] diff --git a/package-lock.json b/package-lock.json index 15fe2e5..81c986b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "0.0.1", + "version": "0.2.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "typescript", - "version": "0.0.1", + "version": "0.2.9", "dependencies": { "axios": "^1.7.9", "vue": "3.5.13" diff --git a/package.json b/package.json index 10aa651..65dcd88 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,13 @@ { "name": "oidc-test-web", - "version": "0.0.1", + "version": "0.2.9", "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/" }