Compare commits

..

No commits in common. "cac5103d52427e777e4c3624ebb253ad7bd393d6" and "fa51b31fe41d41b3ec9becad07ddab4cf73be051" have entirely different histories.

4 changed files with 538 additions and 549 deletions

View File

@ -14,10 +14,10 @@ get:
--- ---
kind: secret kind: secret
name: npm_url name: git_ssh
get: get:
path: odit-npm-cache path: odit-git-bot
name: url name: sshkey
--- ---
kind: pipeline kind: pipeline
@ -25,22 +25,19 @@ type: kubernetes
name: build:dev name: build:dev
steps: steps:
- name: docker dev - name: build dev
image: registry.odit.services/library/drone-kaniko image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
build_args: repo: registry.odit.services/lfk/selfservice
- NPM_REGISTRY_URL:
from_secret: npm_url
repo: lfk/selfservice
tags: tags:
- dev - dev
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- dev - dev
@ -50,25 +47,47 @@ trigger:
--- ---
kind: pipeline kind: pipeline
type: kubernetes type: kubernetes
name: build:latest name: build:testing
steps: steps:
- name: docker latest - name: build testing
image: registry.odit.services/library/drone-kaniko image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
build_args: repo: registry.odit.services/lfk/selfservice
- NPM_REGISTRY_URL: tags:
from_secret: npm_url - testing
repo: lfk/selfservice registry: registry.odit.services
mtu: 1000
trigger:
branch:
- bugfix/31-env_linking
event:
- push
---
kind: pipeline
type: kubernetes
name: build:latest
steps:
- name: build latest
image: plugins/docker
depends_on: [clone]
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: registry.odit.services/lfk/selfservice
tags: tags:
- latest - latest
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- main - main
@ -80,22 +99,19 @@ kind: pipeline
type: kubernetes type: kubernetes
name: build:tags name: build:tags
steps: steps:
- name: docker release - name: build $DRONE_TAG
image: registry.odit.services/library/drone-kaniko image: plugins/docker
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
build_args: repo: registry.odit.services/lfk/selfservice
- NPM_REGISTRY_URL:
from_secret: npm_url
repo: lfk/selfservice
tags: tags:
- "${DRONE_TAG}" - '${DRONE_TAG}'
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
event: event:
- tag - tag

View File

@ -1,12 +1,11 @@
FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17 as build FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
WORKDIR /app WORKDIR /app
RUN npm i -g pnpm@7
COPY . . COPY . .
RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8 RUN pnpm i --frozen-lockfile
RUN pnpm i && pnpm build && pnpm postbuild RUN pnpm build
RUN pnpm postbuild
# final image # final image
FROM registry.odit.services/library/nginx-brotli:3.15 as final FROM registry.odit.services/library/nginx-brotli:3.15
COPY --from=build /app/dist /usr/share/nginx/html COPY --from=0 /app/dist /usr/share/nginx/html
COPY ./nginx.conf /etc/nginx/nginx.conf COPY ./nginx.conf /etc/nginx/nginx.conf

View File

@ -7,9 +7,6 @@
"release": "release-it", "release": "release-it",
"postbuild": "node env_fix.js" "postbuild": "node env_fix.js"
}, },
"engines": {
"pnpm": "8.0.0"
},
"dependencies": { "dependencies": {
"bwip-js": "3.2.2", "bwip-js": "3.2.2",
"marked": "2.0.3", "marked": "2.0.3",

1001
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff