Merge remote-tracking branch 'origin/main' into upgrade-dependencies
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
Brain 2024-08-21 19:40:45 +02:00
commit 5c4c76356a
Signed by: Brain
GPG Key ID: EE936E31EE3AEE7A
3 changed files with 28 additions and 4 deletions

View File

@ -1,2 +1,11 @@
.browserslistrc
.dockerignore
.drone.yml
.editorconfig
.git .git
.gitignore
.reuse
Dockerfile
LICENSES
README.md
node_modules node_modules

View File

@ -26,6 +26,13 @@ steps:
commands: commands:
- npm install -g better-npm-audit - npm install -g better-npm-audit
- better-npm-audit audit --production --level=moderate - better-npm-audit audit --production --level=moderate
- name: docker-dry-run
image: plugins/docker:20.17.3
settings:
registry: git.wtf-eg.de
repo: git.wtf-eg.de/kompetenzinventar/frontend
target: ki-frontend
dry_run: true
--- ---
kind: pipeline kind: pipeline

View File

@ -4,17 +4,25 @@
FROM node:20.12.2-alpine as builder FROM node:20.12.2-alpine as builder
COPY . ./ COPY package.json package-lock.json ./
RUN npm install
COPY .eslintrc.js .
COPY babel.config.js .
COPY public public
COPY src src
RUN npm ci && npm run build RUN npm ci && npm run build
FROM nginx:1.24-alpine as ki-frontend FROM nginx:1.24-alpine as ki-frontend
COPY --from=builder /dist/ /usr/share/nginx/html/
COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend
LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-frontend#docker LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-frontend#docker
LABEL org.opencontainers.image.vendor="WTF Kooperative eG" LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
WORKDIR /usr/share/nginx/html
COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /dist .