From 2d8c4c1698a1675f618e85e678012f310f87c6ee Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 2 Feb 2023 17:19:51 +0100 Subject: [PATCH 1/3] Ignore pnpm lock --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7bd0f387..d1f05fdf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ public/index.html .yarn .pnp.js .yarnrc.yml +pnpm-lock.yaml From 1c980059cff5c87c452428b53513507c2339451f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 2 Feb 2023 17:20:01 +0100 Subject: [PATCH 2/3] Switched drone to kaniko --- .drone.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1c72e934..660e7ceb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,18 +43,23 @@ steps: ssh_key: from_secret: git_ssh - name: build dev - image: plugins/docker - depends_on: [clone] + depends_on: ["clone"] + image: registry.odit.services/library/drone-kaniko settings: username: from_secret: docker_username 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: - dev + cache: true registry: registry.odit.services - mtu: 1000 trigger: branch: - dev @@ -67,18 +72,23 @@ type: kubernetes name: build:tags steps: - name: build $DRONE_TAG - image: plugins/docker - depends_on: [clone] + depends_on: ["clone"] + image: registry.odit.services/library/drone-kaniko settings: username: from_secret: docker_username 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: - - '${DRONE_TAG}' + - "${DRONE_TAG}" + cache: true registry: registry.odit.services - mtu: 1000 trigger: event: - tag \ No newline at end of file From 976755338b8621064f9a73147aa600af1f77cd51 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 2 Feb 2023 17:21:58 +0100 Subject: [PATCH 3/3] Updated docker base images --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca613aad..248cf5f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 COPY package.json ./ -RUN yarn +RUN npx pnpm i COPY package.json *.config.js postcss.config.cjs index.html ./ COPY src ./src COPY public ./public RUN yarn build # final image -FROM registry.odit.services/hub/fholzer/nginx-brotli:v1.19.1 -COPY --from=0 /app/dist /usr/share/nginx/html +FROM registry.odit.services/library/nginx-brotli:3.15 as final +COPY --from=build /app/dist /usr/share/nginx/html COPY ./nginx.conf /etc/nginx/nginx.conf \ No newline at end of file