From b1c2bac834c1147750bf99d3c1fce16b7aa064ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Gerrit=20G=C3=B6bel?= Date: Mon, 9 Sep 2024 09:07:18 +0200 Subject: [PATCH 1/2] Fix Dockerfile for changed angular.json --- .github/workflows/Dockerfile-ci | 11 ----------- Dockerfile | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .github/workflows/Dockerfile-ci diff --git a/.github/workflows/Dockerfile-ci b/.github/workflows/Dockerfile-ci deleted file mode 100644 index 8b12b40..0000000 --- a/.github/workflows/Dockerfile-ci +++ /dev/null @@ -1,11 +0,0 @@ -# Should only be used with GitHub Actions CI pipeline -# For local, refer to Dockerfile at root of project - -FROM nginx:stable-alpine - -COPY dist/* /usr/share/nginx/html - -# copy staged files -COPY .docker/stage-release/ / - -ENTRYPOINT ["entrypoint.sh"] diff --git a/Dockerfile b/Dockerfile index d73e967..68b2417 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN npm run build:prod ###### release image ##### FROM nginx:stable-alpine -COPY --from=sdk /app/dist/* /usr/share/nginx/html +COPY --from=sdk /app/dist/@jggoebel/bashbrawl/* /usr/share/nginx/html/ # copy staged files COPY .docker/stage-release/ / From 2ffbf6bafa3baf5cd9e225f9b42f841dd1a053db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Gerrit=20G=C3=B6bel?= Date: Mon, 9 Sep 2024 09:10:27 +0200 Subject: [PATCH 2/2] Dockerfile-ci still needed --- .github/workflows/Dockerfile-ci | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/Dockerfile-ci diff --git a/.github/workflows/Dockerfile-ci b/.github/workflows/Dockerfile-ci new file mode 100644 index 0000000..018496b --- /dev/null +++ b/.github/workflows/Dockerfile-ci @@ -0,0 +1,11 @@ +# Should only be used with GitHub Actions CI pipeline +# For local, refer to Dockerfile at root of project + +FROM nginx:stable-alpine + +COPY dist/* /usr/share/nginx/html + +# copy staged files +COPY .docker/stage-release/ / + +ENTRYPOINT ["entrypoint.sh"] \ No newline at end of file