diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4cdac79..d460fd1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: CI/CD on: push: @@ -7,7 +7,7 @@ on: jobs: build_docker: - name: Build docker + name: Build Docker runs-on: ubuntu-latest steps: - name: Checkout @@ -19,8 +19,8 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ vars.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push id: docker_build uses: docker/build-push-action@v4 @@ -29,12 +29,30 @@ jobs: push: true platforms: linux/amd64 tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/toyou-backend:latest + ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMAGE_NAME }}:latest cache-from: type=gha cache-to: type=gha,mode=max + + build_docker_acr: + name: Build Docker ACR + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Login to ACR + uses: aliyun/acr-login@v1 + with: + login-server: https://${{ vars.REGISTRY_ADDRESS }} + username: "${{ vars.REGISTRY_USERNAME }}" + password: "${{ secrets.REGISTRY_PASSWORD }}" + - name: Build and push image + run: | + docker build -t ${{ vars.REGISTRY_ADDRESS }}/${{ vars.REGISTRY_NAMESPACE }}/${{ vars.IMAGE_NAME }}:latest . + docker push ${{ vars.REGISTRY_ADDRESS }}/${{ vars.REGISTRY_NAMESPACE }}/${{ vars.IMAGE_NAME }}:latest + deploy: name: Deploy - needs: build_docker + needs: [build_docker, build_docker_acr] runs-on: ubuntu-latest steps: - name: SSH To Host @@ -45,6 +63,5 @@ jobs: key: ${{ secrets.SSH_KEY }} port: ${{ secrets.SSH_PORT }} script: | - cd ${{ secrets.PROJ_PATH }} - sudo docker compose down + cd ${{ secrets.PROJECT_PATH }} sudo bash ./deploy.sh