From 16ef88f1ce2f00978b7c1209d5d3f32c2b2c6428 Mon Sep 17 00:00:00 2001 From: Felix <8057646+GoliathLabs@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:13:59 +0100 Subject: [PATCH 1/5] fix: Dockerfile Signed-off-by: Felix <8057646+GoliathLabs@users.noreply.github.com> --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f732be68..346b0c4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ ### Build stage for the website frontend -FROM --platform=$BUILDPLATFORM node:20-bullseye-slim as build +FROM --platform=$BUILDPLATFORM node:20-bookworm-slim as build RUN apt-get update && \ apt-get install -y python WORKDIR /code COPY . ./ -RUN npm install +RUN npm ci --no-audit --prefer-offline RUN npm run build -FROM nginx:1.25.3-alpine +FROM nginx:1.25.4-alpine COPY --from=build /code/build/ /usr/share/nginx/html -COPY --from=build /code/config.json /usr/share/nginx/html/config.json -EXPOSE 80 \ No newline at end of file +EXPOSE 80 From 1bcd39846a6189547ff1e3875dc93b11b48d6695 Mon Sep 17 00:00:00 2001 From: Felix <8057646+GoliathLabs@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:16:44 +0100 Subject: [PATCH 2/5] Add configs Signed-off-by: Felix <8057646+GoliathLabs@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 346b0c4a..ff9d0e4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,5 @@ RUN npm run build FROM nginx:1.25.4-alpine COPY --from=build /code/build/ /usr/share/nginx/html - +COPY --from=build /code/config*.json /usr/share/nginx/html/ EXPOSE 80 From bcaab124e8333026b06a2f1c82950da49480fd7e Mon Sep 17 00:00:00 2001 From: Felix <8057646+GoliathLabs@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:18:48 +0100 Subject: [PATCH 3/5] fix: python is now python3 Signed-off-by: Felix <8057646+GoliathLabs@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff9d0e4e..5e4357f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ### Build stage for the website frontend FROM --platform=$BUILDPLATFORM node:20-bookworm-slim as build RUN apt-get update && \ -apt-get install -y python +apt-get install -y python3 WORKDIR /code COPY . ./ RUN npm ci --no-audit --prefer-offline From 9a71cff0b7ed1d9d06ae80c78d7a569fc043a9a7 Mon Sep 17 00:00:00 2001 From: Felix <8057646+GoliathLabs@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:37:54 +0100 Subject: [PATCH 4/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e4357f3..3456dbb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apt-get update && \ apt-get install -y python3 WORKDIR /code COPY . ./ -RUN npm ci --no-audit --prefer-offline +RUN npm install RUN npm run build FROM nginx:1.25.4-alpine From cee6982aa7f4d8afdc6f7d01f97cf0fb21f8f943 Mon Sep 17 00:00:00 2001 From: Felix <8057646+GoliathLabs@users.noreply.github.com> Date: Sat, 30 Mar 2024 22:04:35 +0100 Subject: [PATCH 5/5] fix: use config.example.json Signed-off-by: Felix <8057646+GoliathLabs@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3456dbb4..8b826e77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,5 @@ RUN npm run build FROM nginx:1.25.4-alpine COPY --from=build /code/build/ /usr/share/nginx/html -COPY --from=build /code/config*.json /usr/share/nginx/html/ +COPY --from=build /code/config.example.json /usr/share/nginx/html/ EXPOSE 80