From cbc8c76379f4d02dc65f355494d21e608fc59346 Mon Sep 17 00:00:00 2001 From: seventeen <315654883@qq.com> Date: Wed, 28 Aug 2024 19:40:36 +0800 Subject: [PATCH 1/2] update trigger branch --- .github/workflows/build_image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml index bc2ea14..1a35c20 100644 --- a/.github/workflows/build_image.yml +++ b/.github/workflows/build_image.yml @@ -2,7 +2,7 @@ name: build_image on: push: - branches: ["main"] + branches: ["iotex-stg"] tags: ["v*.*.*"] env: From ee24e4d8a76242677e53063fa8247ba64961275c Mon Sep 17 00:00:00 2001 From: seventeen <315654883@qq.com> Date: Thu, 29 Aug 2024 18:21:04 +0800 Subject: [PATCH 2/2] update docker context --- .github/workflows/build_image.yml | 4 +--- nginx/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml index 1a35c20..6fd2da5 100644 --- a/.github/workflows/build_image.yml +++ b/.github/workflows/build_image.yml @@ -59,7 +59,6 @@ jobs: with: platforms: linux/amd64 context: . - file: ./Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta-web.outputs.tags }} labels: ${{ steps.meta-web.outputs.labels }} @@ -75,9 +74,8 @@ jobs: id: build-and-push-nginx uses: docker/build-push-action@v4 with: - context: . + context: ./nginx platforms: linux/amd64 - file: ./nginx/Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta-nginx.outputs.tags }} labels: ${{ steps.meta-nginx.outputs.labels }} diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 3711da8..2d3abe8 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -6,7 +6,7 @@ RUN openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout /etc/ng COPY nginx.conf /etc/nginx/nginx.conf -COPY version.txt /usr/share/nginx/html/version.txt +#COPY version.txt /usr/share/nginx/html/version.txt STOPSIGNAL SIGTERM