From 5a2a8893cb24c385b6d8d2ec94753d0bd9df9659 Mon Sep 17 00:00:00 2001 From: abraaovalentim Date: Thu, 27 Jun 2024 12:12:11 -0300 Subject: [PATCH 1/3] refactor/modify trigger to beta action --- .github/workflows/deploy-beta.yml | 46 +++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index 6b0e39d..e787733 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -2,19 +2,13 @@ name: CI/CD OCA on: push: - branches: ["main"] + branches: ["refact/update-cicd"] jobs: build: runs-on: oca-self-hosted-runner steps: - uses: actions/checkout@v4 - - - name: Stop existing container - run: sudo docker rm -f ${{ vars.CONTAINER_NAME_BETA }} || true - - - name: Remove the old image - run: sudo docker rmi ${{ vars.DOCKER_IMAGE_BETA }}:latest || true - name: Update docker metadata with the tag uses: docker/metadata-action@v4 @@ -31,6 +25,17 @@ jobs: username: ${{ vars.DOCKER_USERNAME }} password: ${{ vars.DOCKER_PASSWORD }} + # - name: Build Docker image with temporary tag + # run: sudo docker build \ + # -f Dockerfile.production \ + # -t ${{ vars.DOCKER_IMAGE_BETA }}:temp \ + # --label key=value \ + # --build-arg NEXT_PUBLIC_HOST_URL=${{ vars.NEXT_PUBLIC_HOST_URL_BETA }} \ + # --build-arg NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} \ + # --build-arg NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} \ + # --build-arg NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} \ + # . + - name: Build and push Docker image uses: docker/build-push-action@v4 with: @@ -46,9 +51,34 @@ jobs: NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} + + - name: Stop existing container + run: sudo docker rm -f ${{ vars.CONTAINER_NAME_BETA }} || true + + # - name: Remove the old image + # run: sudo docker rmi ${{ vars.DOCKER_IMAGE_BETA }}:none || true + + # - name: Retag new image to latest + # run: sudo docker tag ${{ vars.DOCKER_IMAGE_BETA }}:temp ${{ vars.DOCKER_IMAGE_BETA }}:latest - name: Run new container run: sudo docker run --name ${{ vars.CONTAINER_NAME_BETA }} -p ${{ vars.HOST_PORT_BETA }}:${{ vars.CONTAINER_PORT }} -d ${{ vars.DOCKER_IMAGE_BETA }}:latest - + + # - name: Push Docker image + # uses: docker/build-push-action@v4 + # with: + # context: . + # push: true + # file: Dockerfile.production + # labels: ${{ steps.meta.outputs.labels }} + # tags: | + # ${{ vars.DOCKER_IMAGE_BETA }}:latest + # ${{ steps.meta.outputs.tags }} + # build-args: | + # NEXT_PUBLIC_HOST_URL=${{ vars.NEXT_PUBLIC_HOST_URL_BETA }} + # NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} + # NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} + # NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} + - name: Prune unused Docker images run: sudo docker system prune -f From 2d18745eb703f48b3800739a1d5e4d4e31a15a2c Mon Sep 17 00:00:00 2001 From: abraaovalentim Date: Thu, 27 Jun 2024 12:17:01 -0300 Subject: [PATCH 2/3] refactor/modify trigger to beta action --- .github/workflows/deploy-beta.yml | 39 +++---------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index e787733..8905bf2 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -25,17 +25,6 @@ jobs: username: ${{ vars.DOCKER_USERNAME }} password: ${{ vars.DOCKER_PASSWORD }} - # - name: Build Docker image with temporary tag - # run: sudo docker build \ - # -f Dockerfile.production \ - # -t ${{ vars.DOCKER_IMAGE_BETA }}:temp \ - # --label key=value \ - # --build-arg NEXT_PUBLIC_HOST_URL=${{ vars.NEXT_PUBLIC_HOST_URL_BETA }} \ - # --build-arg NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} \ - # --build-arg NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} \ - # --build-arg NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} \ - # . - - name: Build and push Docker image uses: docker/build-push-action@v4 with: @@ -51,34 +40,12 @@ jobs: NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} - + - name: Stop existing container run: sudo docker rm -f ${{ vars.CONTAINER_NAME_BETA }} || true - - # - name: Remove the old image - # run: sudo docker rmi ${{ vars.DOCKER_IMAGE_BETA }}:none || true - - # - name: Retag new image to latest - # run: sudo docker tag ${{ vars.DOCKER_IMAGE_BETA }}:temp ${{ vars.DOCKER_IMAGE_BETA }}:latest - + - name: Run new container run: sudo docker run --name ${{ vars.CONTAINER_NAME_BETA }} -p ${{ vars.HOST_PORT_BETA }}:${{ vars.CONTAINER_PORT }} -d ${{ vars.DOCKER_IMAGE_BETA }}:latest - - # - name: Push Docker image - # uses: docker/build-push-action@v4 - # with: - # context: . - # push: true - # file: Dockerfile.production - # labels: ${{ steps.meta.outputs.labels }} - # tags: | - # ${{ vars.DOCKER_IMAGE_BETA }}:latest - # ${{ steps.meta.outputs.tags }} - # build-args: | - # NEXT_PUBLIC_HOST_URL=${{ vars.NEXT_PUBLIC_HOST_URL_BETA }} - # NEXT_PUBLIC_GEE_PRIVATE_KEY=${{ secrets.NEXT_PUBLIC_GEE_PRIVATE_KEY }} - # NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} - # NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} - + - name: Prune unused Docker images run: sudo docker system prune -f From af1cde107d57361f77b396ed0496718096bf6c5e Mon Sep 17 00:00:00 2001 From: abraaovalentim Date: Tue, 2 Jul 2024 07:54:57 -0300 Subject: [PATCH 3/3] refactor: changes the order of cicd prod and the branch in cicd beta --- .github/workflows/deploy-beta.yml | 2 +- .github/workflows/deploy-oca.yml | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index 8905bf2..926cc9f 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -2,7 +2,7 @@ name: CI/CD OCA on: push: - branches: ["refact/update-cicd"] + branches: ["main"] jobs: build: diff --git a/.github/workflows/deploy-oca.yml b/.github/workflows/deploy-oca.yml index a2cdd57..4438abc 100644 --- a/.github/workflows/deploy-oca.yml +++ b/.github/workflows/deploy-oca.yml @@ -10,12 +10,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Stop existing container - run: sudo docker rm -f ${{ vars.CONTAINER_NAME_PROD }} || true - - - name: Remove the old image - run: sudo docker rmi ${{ vars.DOCKER_IMAGE_PROD }}:latest || true - - name: Update docker metadata with the tag uses: docker/metadata-action@v4 id: meta @@ -47,7 +41,10 @@ jobs: NEXT_PUBLIC_GA_ID=${{ secrets.NEXT_PUBLIC_GA_ID }} NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN=${{ secrets.NEXT_PUBLIC_CONTENTFUL_ACCESS_TOKEN }} NEXT_PUBLIC_CONTENTFUL_SPACE=${{ secrets.NEXT_PUBLIC_CONTENTFUL_SPACE }} - + + - name: Stop existing container + run: sudo docker rm -f ${{ vars.CONTAINER_NAME_PROD }} || true + - name: Run new container run: sudo docker run --name ${{ vars.CONTAINER_NAME_PROD }} -p ${{ vars.HOST_PORT_PROD }}:${{ vars.CONTAINER_PORT }} -d ${{ vars.DOCKER_IMAGE_PROD }}:latest