From 6ade265350b4249c6adf9afe0cdfcc4dd9871f24 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:19:42 +0200 Subject: [PATCH 1/7] dev mgirated to buildkit --- .gitea/workflows/dev.yaml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 0105955..2c0baa5 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -19,17 +19,29 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to registry + uses: docker/login-action@v2 + with: + registry: gitea.sikorski.cloud + username: rogersik + password: ${{ secrets.REGISTRY_PASSWORD }} + - name: Clean Branch Name id: clean_branch_name run: | CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-') echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV - - name: Kaniko build - uses: aevea/action-kaniko@v0.12.0 - with: - image: rogersik/monica - registry: gitea.sikorski.cloud - tag: "${{ env.CLEAN_BRANCH_NAME }}" - cache: true - username: rogersik - password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Build and push Docker image + run: | + docker buildx build \ + --platform linux/amd64,linux/arm64 \ + --tag gitea.sikorski.cloud/rogersik/monica:${CLEAN_BRANCH_NAME} \ + --cache-from=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache \ + --cache-to=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache,mode=max \ + --push \ + . -- 2.49.1 From 1201eb1b8b987c10a1ed6ebb494bc89b43996402 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:22:11 +0200 Subject: [PATCH 2/7] troubleshooting --- .gitea/workflows/dev.yaml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 2c0baa5..45c9e3d 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -17,11 +17,23 @@ jobs: build: needs: dockerfile_lint runs-on: ubuntu-22.04 + env: + DOCKER_HOST: tcp://localhost:2376 + DOCKER_TLS_VERIFY: '1' + DOCKER_CERT_PATH: /certs/client steps: - uses: actions/checkout@v4 + - name: Clean Branch Name + id: clean_branch_name + run: | + CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-') + echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + with: + driver-opts: host=tcp://localhost:2376 - name: Log in to registry uses: docker/login-action@v2 @@ -30,12 +42,6 @@ jobs: username: rogersik password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Clean Branch Name - id: clean_branch_name - run: | - CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-') - echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV - - name: Build and push Docker image run: | docker buildx build \ -- 2.49.1 From 096b719cd0209b7a0e82f9f6c007db185596342f Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:22:55 +0200 Subject: [PATCH 3/7] troubleshooting --- .gitea/workflows/dev.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 45c9e3d..c6caab9 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -18,9 +18,7 @@ jobs: needs: dockerfile_lint runs-on: ubuntu-22.04 env: - DOCKER_HOST: tcp://localhost:2376 - DOCKER_TLS_VERIFY: '1' - DOCKER_CERT_PATH: /certs/client + DOCKER_HOST: tcp://localhost:2375 # unverschlüsselte Verbindung steps: - uses: actions/checkout@v4 @@ -33,7 +31,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - driver-opts: host=tcp://localhost:2376 + driver-opts: host=tcp://localhost:2375 # Verbindung ohne TLS - name: Log in to registry uses: docker/login-action@v2 -- 2.49.1 From 62fa5a6e09a7e28b8b16f7db49d236a3b8abe7d7 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:23:49 +0200 Subject: [PATCH 4/7] troubleshooting --- .gitea/workflows/dev.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index c6caab9..b2edb48 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -40,12 +40,19 @@ jobs: username: rogersik password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Build and push Docker image + - name: Build and push Docker image with Buildx + env: + DOCKER_HOST: tcp://localhost:2375 run: | + # create builder instance + docker buildx create --name mybuilder --use || true + docker buildx inspect --bootstrap + + # build and push docker buildx build \ --platform linux/amd64,linux/arm64 \ - --tag gitea.sikorski.cloud/rogersik/monica:${CLEAN_BRANCH_NAME} \ + --tag gitea.sikorski.cloud/rogersik/monica:${{ env.CLEAN_BRANCH_NAME }} \ --cache-from=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache \ --cache-to=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache,mode=max \ --push \ - . + . -- 2.49.1 From ea35f959a00e1ea56d7bb1bff255df8754fdca22 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:24:38 +0200 Subject: [PATCH 5/7] typo --- .gitea/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index b2edb48..ce9b1ca 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -55,4 +55,4 @@ jobs: --cache-from=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache \ --cache-to=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache,mode=max \ --push \ - . + . -- 2.49.1 From 9437a1aed5c38ed076be04ae0f03f295a4a35518 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:25:30 +0200 Subject: [PATCH 6/7] troubleshooting again --- .gitea/workflows/dev.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index ce9b1ca..8f0eb28 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -18,7 +18,7 @@ jobs: needs: dockerfile_lint runs-on: ubuntu-22.04 env: - DOCKER_HOST: tcp://localhost:2375 # unverschlüsselte Verbindung + DOCKER_HOST: tcp://localhost:2375 # DinD TCP ohne TLS steps: - uses: actions/checkout@v4 @@ -28,11 +28,6 @@ jobs: CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-') echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver-opts: host=tcp://localhost:2375 # Verbindung ohne TLS - - name: Log in to registry uses: docker/login-action@v2 with: @@ -41,17 +36,15 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} - name: Build and push Docker image with Buildx - env: - DOCKER_HOST: tcp://localhost:2375 run: | - # create builder instance + # create builder instance manually (no driver-opts) docker buildx create --name mybuilder --use || true docker buildx inspect --bootstrap # build and push docker buildx build \ --platform linux/amd64,linux/arm64 \ - --tag gitea.sikorski.cloud/rogersik/monica:${{ env.CLEAN_BRANCH_NAME }} \ + --tag gitea.sikorski.cloud/rogersik/monica:${CLEAN_BRANCH_NAME} \ --cache-from=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache \ --cache-to=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache,mode=max \ --push \ -- 2.49.1 From 7b5f268583a2b3cd822f349ef15be53b8f640fe0 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sat, 25 Oct 2025 21:26:18 +0200 Subject: [PATCH 7/7] push --- .gitea/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 8f0eb28..0a14f16 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -18,7 +18,7 @@ jobs: needs: dockerfile_lint runs-on: ubuntu-22.04 env: - DOCKER_HOST: tcp://localhost:2375 # DinD TCP ohne TLS + DOCKER_HOST: tcp://dind-docker:2375 steps: - uses: actions/checkout@v4 -- 2.49.1