diff --git a/.github/workflows/cd-dev.yml b/.github/workflows/cd-dev.yml index c3e1fce1..3a1b95fa 100644 --- a/.github/workflows/cd-dev.yml +++ b/.github/workflows/cd-dev.yml @@ -43,9 +43,9 @@ jobs: if: contains(github.ref, 'develop') || contains(github.ref, 'main') run: | docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t kodaero -f ./Dockerfile . - docker tag kodaero:latest ${{ secrets.DOCKER_USER }}/kodaero:latest - docker push ${{ secrets.DOCKER_USER }}/kodaero:latest + docker build -t kodaero-dev -f ./Dockerfile . + docker tag kodaero-dev:latest ${{ secrets.DOCKER_USER }}/kodaero-dev:latest + docker push ${{ secrets.DOCKER_USER }}/kodaero-dev:latest pull_from_registry: @@ -66,7 +66,7 @@ jobs: key: ${{ secrets.SSH_KEY }} port: ${{ secrets.PORT }} script: | - docker pull ${{ secrets.DOCKER_USER }}/kodaero:latest - chmod +x ./deploy.sh - sudo ./deploy.sh dev + docker pull ${{ secrets.DOCKER_USER }}/kodaero-dev:latest + chmod +x ./deploy-dev.sh + sudo ./deploy-dev.sh docker image prune -f diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ba0cc698..2b087a85 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -43,9 +43,12 @@ jobs: if: contains(github.ref, 'develop') || contains(github.ref, 'main') run: | docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t kodaero -f ./Dockerfile . - docker tag kodaero:latest ${{ secrets.DOCKER_USER }}/kodaero:latest - docker push ${{ secrets.DOCKER_USER }}/kodaero:latest + docker pull ${{ secrets.DOCKER_USER }}/kodaero-app:latest || true + docker tag ${{ secrets.DOCKER_USER }}/kodaero-app:latest ${{ secrets.DOCKER_USER }}/kodaero-app:stable || true + docker push ${{ secrets.DOCKER_USER }}/kodaero-app:stable || true + docker build -t kodaero-app -f ./Dockerfile . + docker tag kodaero-app:latest ${{ secrets.DOCKER_USER }}/kodaero-app:latest + docker push ${{ secrets.DOCKER_USER }}/kodaero-app:latest pull_from_registry: @@ -66,7 +69,7 @@ jobs: key: ${{ secrets.SSH_KEY }} port: ${{ secrets.PORT }} script: | - docker pull ${{ secrets.DOCKER_USER }}/kodaero:latest - chmod +x ./deploy.sh - sudo ./deploy.sh prod + docker pull ${{ secrets.DOCKER_USER }}/kodaero-app:latest + chmod +x ./deploy-prod.sh + sudo ./deploy-prod.sh 14 docker image prune -f