diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 307c6a8..b61a23c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -15,19 +15,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 + with: + platforms: 'arm64' # support AWS EC2 t4g - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ap-northeast-2 - name: Login to Amazon ECR - uses: aws-actions/amazon-ecr-login@v1 + uses: aws-actions/amazon-ecr-login@v2 with: mask-password: 'true' - name: Determine Prod/Dev Stage @@ -40,9 +42,10 @@ jobs: echo "IMAGE_TAG=latest" >> $GITHUB_ENV fi - name: Build and Push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . + platforms: linux/arm64 # support AWS EC2 t4g tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} cache-from: type=gha cache-to: type=gha,mode=max @@ -54,9 +57,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check the deployed service URL - uses: jtalk/url-health-check-action@v3 + uses: jtalk/url-health-check-action@v4 with: - url: https://poapper.club|https://dev.poapper.club + url: https://poapper.club follow-redirect: true max-attempts: 3 retry-delay: 10s diff --git a/docker-stack.yaml b/docker-stack.yaml index 0313bc4..a459e0d 100644 --- a/docker-stack.yaml +++ b/docker-stack.yaml @@ -1,22 +1,8 @@ version: '3.3' services: - dev: - image: 151345152001.dkr.ecr.ap-northeast-2.amazonaws.com/poapper-homepage:latest - ports: - - 9001:80 - logging: - driver: local - options: - max-size: 10m - deploy: - labels: - swarmpit.service.deployment.autoredeploy: 'true' - placement: - constraints: - - node.role != manager - - node.labels.application == poapper_web prod: - image: 151345152001.dkr.ecr.ap-northeast-2.amazonaws.com/poapper-homepage:vX.X.X + # image: 151345152001.dkr.ecr.ap-northeast-2.amazonaws.com/poapper-homepage:vX.X.X + image: 151345152001.dkr.ecr.ap-northeast-2.amazonaws.com/poapper-homepage:latest ports: - 9000:80 logging: @@ -29,4 +15,4 @@ services: placement: constraints: - node.role != manager - - node.labels.application == poapper_web + - node.labels.application == popo diff --git a/nginx/poapper-dev.nginx b/nginx/poapper-dev.nginx deleted file mode 100644 index f01cb30..0000000 --- a/nginx/poapper-dev.nginx +++ /dev/null @@ -1,11 +0,0 @@ -server { - server_name dev.poapper.club; - client_max_body_size 10M; - - location / { - proxy_pass http://localhost:9001; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - } -}