From 2546bb1b5e19b9579735ca9fed78c6981fb1b9e3 Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 10:56:41 +0300 Subject: [PATCH 1/8] feat: Add images with another docker versions --- .github/workflows/release.yml | 17 ++++++++++++----- Dockerfile | 4 +++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b7f03d..8b951b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,21 +1,24 @@ name: Release Image on: + workflow_dispatch: push: branches: - - 'main' + - "main" tags: - - 'v*.*.*' + - "v*.*.*" env: - IMAGE_NAME: ghcr.io/kitconcept/docker-stack-deploy + # TODO Remove before create pr + IMAGE_NAME: ghcr.io/educorg/docker-stack-deploy jobs: - release: runs-on: ubuntu-latest + strategy: + matrix: + docker-version: [24, 28, 29] steps: - - name: Checkout uses: actions/checkout@v5 @@ -33,6 +36,8 @@ jobs: type=semver,pattern={{major}} type=sha type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} + flavor: | + suffix=${{ matrix.docker-version }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -55,3 +60,5 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + "DOCKER_IMAGE_TAG=${{ matrix.docker-version }}-cli" diff --git a/Dockerfile b/Dockerfile index ebca988..dc0350d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM docker:29.1.3-cli-alpine3.23 +ARG DOCKER_IMAGE_TAG=29-cli + +FROM docker:${DOCKER_IMAGE_TAG} LABEL maintainer="kitconcept GmbH " \ org.label-schema.name="docker-stack-deploy" \ From 6f24f84f8ec6bda955d03a5c6a3e457e113fbaca Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 10:58:19 +0300 Subject: [PATCH 2/8] tmp enable for all branches --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b951b9..c847519 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - "main" + - "*" tags: - "v*.*.*" From 188f91d05e07903b9f7ae722070f05c9130e1068 Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 10:58:51 +0300 Subject: [PATCH 3/8] Update release.yml --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c847519..f44398e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,10 +3,10 @@ name: Release Image on: workflow_dispatch: push: - branches: - - "*" - tags: - - "v*.*.*" + # branches: + # - "main" + # tags: + # - "v*.*.*" env: # TODO Remove before create pr From d80e2f65f87eaebaa8eb25d8ccf65cb467e316a1 Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 11:03:53 +0300 Subject: [PATCH 4/8] Change suffix --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f44398e..a1f41c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: type=sha type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} flavor: | - suffix=${{ matrix.docker-version }} + suffix=-docker-${{ matrix.docker-version }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 From bd545953b69b1c3a6e38e7ed963fbe6e81cc05c8 Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 11:08:30 +0300 Subject: [PATCH 5/8] Remove suffix for 29 version --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1f41c0..7a76fa2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: type=sha type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} flavor: | - suffix=-docker-${{ matrix.docker-version }} + suffix=${{ matrix.docker-version != '29' && format('-docker-{0}', matrix.docker-version) || '' }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 From f10d706ec081bb5062263a853682e61c4cd359ee Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 11:41:30 +0300 Subject: [PATCH 6/8] Remove 24 version, ghcr don't support it --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a76fa2..7cc18e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - docker-version: [24, 28, 29] + docker-version: [28, 29] steps: - name: Checkout uses: actions/checkout@v5 From 33e20e86883019ffe7ad2245f8ee529e77cf463d Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 11:42:57 +0300 Subject: [PATCH 7/8] Remove tmp code --- .github/workflows/release.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cc18e6..f739176 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,16 +1,14 @@ name: Release Image on: - workflow_dispatch: push: - # branches: - # - "main" - # tags: - # - "v*.*.*" + branches: + - 'main' + tags: + - 'v*.*.*' env: - # TODO Remove before create pr - IMAGE_NAME: ghcr.io/educorg/docker-stack-deploy + IMAGE_NAME: ghcr.io/kitconcept/docker-stack-deploy jobs: release: From 4c3928156779e63ce9a15d3606eee9beff9933be Mon Sep 17 00:00:00 2001 From: Kolobok12309 Date: Mon, 16 Feb 2026 11:43:29 +0300 Subject: [PATCH 8/8] Small format --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f739176..72a7970 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,12 +11,14 @@ env: IMAGE_NAME: ghcr.io/kitconcept/docker-stack-deploy jobs: + release: runs-on: ubuntu-latest strategy: matrix: docker-version: [28, 29] steps: + - name: Checkout uses: actions/checkout@v5