Skip to content

Commit

Permalink
Merge pull request #5 from chaishiqi/iotex-stg
Browse files Browse the repository at this point in the history
Iotex stg
  • Loading branch information
huangzhiran authored Aug 30, 2024
2 parents 899a8c9 + ee24e4d commit df1a9df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build_image

on:
push:
branches: ["main"]
branches: ["iotex-stg"]
tags: ["v*.*.*"]

env:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit df1a9df

Please sign in to comment.