From c508420a278fe37a92ba2fc685c539acc4b6c871 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 4 May 2024 18:03:51 -0600 Subject: [PATCH] chore: add platform to docker script --- .github/workflows/canary.yml | 28 ++++++++-------------------- docker/build.sh | 4 +--- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 34adb6510..88e9bb70a 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -10,17 +10,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - - name: Set up custom builder - id: buildx + + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - with: - driver-opts: | - image=moby/buildkit:master - network=host - buildkitd-flags: '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host' - # Puedes agregar más opciones según tus necesidades - - name: Login to Docker Hub uses: docker/login-action@v3 @@ -30,13 +22,9 @@ jobs: - name: Prepare .env file run: | - cp .env.production.example .env.production - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64 - push: false - tags: dokploy/dokploy:canary - builder: ${{ steps.buildx.outputs.name }} + cp .env.production.example .env.production + + - name: Build Docker image using custom script + run: | + chmod +x ./docker/build.sh + ./docker/build.sh ${{ github.ref_name == 'canary' && 'canary' || '' }} \ No newline at end of file diff --git a/docker/build.sh b/docker/build.sh index ef38fa4fa..75de07783 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -10,8 +10,6 @@ else TAG="$VERSION" fi -BUILDER=$(docker buildx create --use) -docker buildx build --platform linux/amd64,linux/arm64 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' . +docker build --platform=linux/amd64,linux/arm64 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' . -docker buildx rm $BUILDER