From 8032dd08bc23430fdb269bfa3fdd67ae865a9e56 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 27 Apr 2023 13:46:47 +0200 Subject: [PATCH] coolify-builder image update update update process :D --- .github/workflows/coolify-builder.yml | 30 +++++++++++++++++++++++++++ docker/builder/Dockerfile | 8 +++---- scripts/upgrade.sh | 3 +-- 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/coolify-builder.yml diff --git a/.github/workflows/coolify-builder.yml b/.github/workflows/coolify-builder.yml new file mode 100644 index 000000000..4fe20e6c2 --- /dev/null +++ b/.github/workflows/coolify-builder.yml @@ -0,0 +1,30 @@ +name: Coolify Builder (v4) + +on: + push: + branches: ["v4"] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: "coollabsio/coolify-builder" + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Login to ghcr.io + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build imaged and push to registry + uses: docker/build-push-action@v3 + with: + no-cache: true + context: . + file: docker/builder/Dockerfile + platforms: linux/amd64 + push: true + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index 5499375c5..47039d419 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -2,14 +2,14 @@ FROM alpine:3.17 ARG TARGETPLATFORM # https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=20.10.18 +ARG DOCKER_VERSION=23.0.5 # https://github.com/docker/compose/releases # Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug. -ARG DOCKER_COMPOSE_VERSION=2.6.1 +ARG DOCKER_COMPOSE_VERSION=2.17.3 # https://github.com/buildpacks/pack/releases ARG PACK_VERSION=0.27.0 # https://github.com/railwayapp/nixpacks/releases -ARG NIXPACKS_VERSION=1.6.0 +ARG NIXPACKS_VERSION=1.6.1 USER root WORKDIR /artifacts @@ -17,7 +17,7 @@ RUN apk add --no-cache bash curl git git-lfs openssh-client tar tini RUN mkdir -p ~/.docker/cli-plugins 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-v$PACK_VERSION -o /usr/local/bin/pack +RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /usr/local/bin/pack RUN curl -sSL https://nixpacks.com/install.sh | bash RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index fd943afed..16f758303 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -1,5 +1,4 @@ #!/bin/bash ## Do not modify this file. You will lost the ability to autoupdate! -export APP_TAG=$1 -docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate +docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock -ti --rm ghcr.io/coollabsio/coolify-builder bash -c "APP_TAG=$1 docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"