Merge remote-tracking branch 'origin/main' into upgrade-dependencies

Merge pull request 'Fix Dockerfile' (!89 ) from fix-dockerfile into main
Reviewed-on: #89
2024-08-21 19:40:45 +02:00 · 2024-04-23 23:07:43 +02:00 · 2024-04-23 22:48:01 +02:00 · 2024-04-23 22:47:54 +02:00 · 2024-04-23 22:26:14 +02:00 · 2024-01-12 18:42:27 +01:00
3 changed files with 28 additions and 4 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +1,11 @@
+.browserslistrc
+.dockerignore
+.drone.yml
+.editorconfig
 .git
+.gitignore
+.reuse
+Dockerfile
+LICENSES
+README.md
 node_modules
--- a/.drone.yml
+++ b/.drone.yml
@ -26,6 +26,13 @@ steps:
    commands:
      - npm install -g better-npm-audit
      - 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
--- a/16
+++ b/16
@ -4,17 +4,25 @@

 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


 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.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.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 .
Author	SHA1	Message	Date
Brain	5c4c76356a	Merge remote-tracking branch 'origin/main' into upgrade-dependencies All checks were successful continuous-integration/drone/pr Build is passing Details	2024-08-21 19:40:45 +02:00
Brain	d46aaa0f31	Merge pull request 'Fix Dockerfile' (!89 ) from fix-dockerfile into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #89	2024-04-23 23:07:43 +02:00
Brain	81dcf5ebe7	Try to build Docker image for Pull Requests All checks were successful continuous-integration/drone/pr Build is passing Details	2024-04-23 22:48:01 +02:00
Brain	7433d25716	Add missing trailing slash	2024-04-23 22:47:54 +02:00
Brain	7feee07d35	Merge pull request '♻️ Optimize Dockerfile' (!85 ) from optimize-dockerfile into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #85 Reviewed-by: srsh <srsh@noreply.git.wtf-eg.de>	2024-04-23 22:26:14 +02:00
Mic Szillat	f8e78d1cc8	♻️ Optimize Dockerfile All checks were successful continuous-integration/drone/pr Build is passing Details - add all non-essential files to .dockerignore - improve cachability by layers - re-order lines to reduce layer generation	2024-01-12 18:42:27 +01:00