From 7f94593c07c735a0f58ccba664d8044496600ca1 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 24 Oct 2024 23:35:21 -0600 Subject: [PATCH] chore: revert ci/cd --- .circleci/config.yml | 30 ++++--- .github/workflows/deploy.yml | 152 +++++++++++++++++------------------ 2 files changed, 90 insertions(+), 92 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ad1ee71..07991599 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,27 +58,27 @@ jobs: command: | docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_TOKEN - # if [ "${CIRCLE_BRANCH}" == "main" ]; then - # VERSION=$(node -p "require('./apps/dokploy/package.json').version") - # echo $VERSION - # TAG="latest" + if [ "${CIRCLE_BRANCH}" == "main" ]; then + VERSION=$(node -p "require('./apps/dokploy/package.json').version") + echo $VERSION + TAG="latest" - # docker manifest create dokploy/dokploy:${TAG} \ - # dokploy/dokploy:${TAG}-amd64 \ - # dokploy/dokploy:${TAG}-arm64 - # docker manifest push dokploy/dokploy:${TAG} + docker manifest create dokploy/dokploy:${TAG} \ + dokploy/dokploy:${TAG}-amd64 \ + dokploy/dokploy:${TAG}-arm64 + docker manifest push dokploy/dokploy:${TAG} - # docker manifest create dokploy/dokploy:${VERSION} \ - # dokploy/dokploy:${TAG}-amd64 \ - # dokploy/dokploy:${TAG}-arm64 - # docker manifest push dokploy/dokploy:${VERSION} - # else + docker manifest create dokploy/dokploy:${VERSION} \ + dokploy/dokploy:${TAG}-amd64 \ + dokploy/dokploy:${TAG}-arm64 + docker manifest push dokploy/dokploy:${VERSION} + else TAG="canary" docker manifest create dokploy/dokploy:${TAG} \ dokploy/dokploy:${TAG}-amd64 \ dokploy/dokploy:${TAG}-arm64 docker manifest push dokploy/dokploy:${TAG} - # fi + fi workflows: build-all: @@ -89,14 +89,12 @@ workflows: only: - main - canary - - feat/remove-build-on-server - build-arm64: filters: branches: only: - main - canary - - feat/remove-build-on-server - combine-manifests: requires: - build-amd64 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 19cfe7d7..e50c7207 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,52 +2,52 @@ name: Build Docker images on: push: - branches: ["canary", "main" ,"feat/remove-build-on-server"] + branches: ["canary", "main"] jobs: - # build-and-push-image-docs: - # runs-on: ubuntu-latest + build-and-push-image-docs: + runs-on: ubuntu-latest - # steps: - # - name: Checkout repository - # uses: actions/checkout@v4 + steps: + - name: Checkout repository + uses: actions/checkout@v4 - # - name: Log in to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Build and push Docker image - # uses: docker/build-push-action@v4 - # with: - # context: . - # file: ./Dockerfile.docs - # push: true - # tags: dokploy/docs:latest - # platforms: linux/amd64 + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile.docs + push: true + tags: dokploy/docs:latest + platforms: linux/amd64 - # build-and-push-image-website: - # runs-on: ubuntu-latest + build-and-push-image-website: + runs-on: ubuntu-latest - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - # - name: Log in to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Build and push Docker image - # uses: docker/build-push-action@v4 - # with: - # context: . - # file: ./Dockerfile.website - # push: true - # tags: dokploy/website:latest - # platforms: linux/amd64 + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile.website + push: true + tags: dokploy/website:latest + platforms: linux/amd64 build-and-push-cloud-image: @@ -68,54 +68,54 @@ jobs: with: context: . file: ./Dockerfile.cloud - # push: true + push: true tags: | siumauricio/cloud:${{ github.ref_name == 'main' && 'main' || 'canary' }} platforms: linux/amd64 - # build-and-push-schedule-image: - # runs-on: ubuntu-latest + build-and-push-schedule-image: + runs-on: ubuntu-latest - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - # - name: Log in to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Build and push Docker image - # uses: docker/build-push-action@v4 - # with: - # context: . - # file: ./Dockerfile.schedule - # push: true - # tags: | - # siumauricio/schedule:${{ github.ref_name == 'main' && 'main' || 'canary' }} - # platforms: linux/amd64 + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile.schedule + push: true + tags: | + siumauricio/schedule:${{ github.ref_name == 'main' && 'main' || 'canary' }} + platforms: linux/amd64 - # build-and-push-server-image: - # runs-on: ubuntu-latest + build-and-push-server-image: + runs-on: ubuntu-latest - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - # - name: Log in to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Build and push Docker image - # uses: docker/build-push-action@v4 - # with: - # context: . - # file: ./Dockerfile.server - # push: true - # tags: | - # siumauricio/server:${{ github.ref_name == 'main' && 'main' || 'canary' }} - # platforms: linux/amd64 \ No newline at end of file + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile.server + push: true + tags: | + siumauricio/server:${{ github.ref_name == 'main' && 'main' || 'canary' }} + platforms: linux/amd64 \ No newline at end of file