From 7fd93ab556dc3b244c915439dd866da242955fad Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 2 May 2023 17:53:06 +0200
Subject: [PATCH] new builder image

---
 .github/workflows/coolify-builder.yml          |  4 ++--
 docker/{builder => coolify-builder}/Dockerfile | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename docker/{builder => coolify-builder}/Dockerfile (68%)

diff --git a/.github/workflows/coolify-builder.yml b/.github/workflows/coolify-builder.yml
index 24f1c91a9..e044ed5a3 100644
--- a/.github/workflows/coolify-builder.yml
+++ b/.github/workflows/coolify-builder.yml
@@ -2,7 +2,7 @@ name: Coolify Builder (v4)
 
 on:
   push:
-    branches: ["this-does-not-exist"]
+    branches: ["v4", "v4-next"]
 
 env:
   REGISTRY: ghcr.io
@@ -24,7 +24,7 @@ jobs:
         with:
           no-cache: true
           context: .
-          file: docker/builder/Dockerfile
+          file: docker/coolify-builder/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
diff --git a/docker/builder/Dockerfile b/docker/coolify-builder/Dockerfile
similarity index 68%
rename from docker/builder/Dockerfile
rename to docker/coolify-builder/Dockerfile
index 868c48cd3..806cf2169 100644
--- a/docker/builder/Dockerfile
+++ b/docker/coolify-builder/Dockerfile
@@ -17,12 +17,14 @@ WORKDIR /artifacts
 RUN apk add --no-cache bash curl git git-lfs openssh-client tar tini
 RUN mkdir -p ~/.docker/cli-plugins
 RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
-    curl -SL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v0.10.4.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
-    curl -SL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \
-    (curl -sSL "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack) && \
+    curl -SL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
+    curl -SL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \
+    (curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar -C /usr/bin/ --no-same-owner -xzv --strip-components=1 docker/docker) && \
+    (curl -sSL https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz | tar -C /usr/local/bin/ --no-same-owner -xzv pack) && \
     curl -sSL https://nixpacks.com/install.sh | bash && \
-    chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack; \
-    fi
+    chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack /root/.docker/cli-plugins/docker-buildx \
+    ;fi
+RUN
 # RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-$DOCKER_VERSION -o /usr/bin/docker
 # RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-$DOCKER_COMPOSE_VERSION -o ~/.docker/cli-plugins/docker-compose
 # RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /usr/local/bin/pack