diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml index 584d6416..a14393fa 100644 --- a/.github/workflows/showpot-dev-cd.yml +++ b/.github/workflows/showpot-dev-cd.yml @@ -50,10 +50,10 @@ jobs: - name: Get Github Actions IP id: ip - uses: haythem/public-ip@v1.2 + uses: haythem/public-ip@v1.3 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }} @@ -70,11 +70,13 @@ jobs: username: ec2-user key: ${{ secrets.EC2_DEV_SSH_PRIVATE_KEY }} script: | + docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} docker pull ${{ secrets.DOCKERHUB_USERNAME }}/showpot:dev docker stop showpot-dev docker rm showpot-dev docker run -d -p 8080:8080 --name showpot-dev ${{ secrets.DOCKERHUB_USERNAME }}/showpot:dev - name: Remove Github Actions IP From Security Group + if: always() run: | aws ec2 revoke-security-group-ingress --group-id ${{ secrets.AWS_DEV_SECURITY_GROUP_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32