Merge branch 'dev' into feature/143-beamershow_clients

This commit is contained in:
Nicolai Ort 2023-02-02 17:23:33 +01:00
commit 85ceaa464f
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
2 changed files with 23 additions and 13 deletions

View File

@ -43,18 +43,23 @@ steps:
ssh_key: ssh_key:
from_secret: git_ssh from_secret: git_ssh
- name: build dev - name: build dev
image: plugins/docker depends_on: ["clone"]
depends_on: [clone] image: registry.odit.services/library/drone-kaniko
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/frontend build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/frontend
tags: tags:
- dev - dev
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- dev - dev
@ -67,18 +72,23 @@ type: kubernetes
name: build:tags name: build:tags
steps: steps:
- name: build $DRONE_TAG - name: build $DRONE_TAG
image: plugins/docker depends_on: ["clone"]
depends_on: [clone] image: registry.odit.services/library/drone-kaniko
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/frontend build_args:
- NPM_REGISTRY_DOMAIN:
from_secret: npmjs_domain
- NPM_REGISTRY_TOKEN:
from_secret: npmjs_token
repo: lfk/frontend
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,12 @@
FROM registry.odit.services/hub/library/node:15.14.0-alpine3.13 FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as build
WORKDIR /app WORKDIR /app
COPY package.json ./ COPY package.json ./
RUN yarn RUN npx pnpm i
COPY package.json *.config.js postcss.config.cjs index.html ./ COPY package.json *.config.js postcss.config.cjs index.html ./
COPY src ./src COPY src ./src
COPY public ./public COPY public ./public
RUN yarn build RUN yarn build
# final image # final image
FROM registry.odit.services/hub/fholzer/nginx-brotli:v1.19.1 FROM registry.odit.services/library/nginx-brotli:3.15 as final
COPY --from=0 /app/dist /usr/share/nginx/html COPY --from=build /app/dist /usr/share/nginx/html
COPY ./nginx.conf /etc/nginx/nginx.conf COPY ./nginx.conf /etc/nginx/nginx.conf