From e3c2268ce72277275516dd8ba9cc66a51a263245 Mon Sep 17 00:00:00 2001 From: Kai Reichart Date: Wed, 27 Nov 2024 14:28:20 +0100 Subject: [PATCH] use kaniko --- .github/workflows/build-docker-test.yml | 4 ++-- .github/workflows/build-docker.yml | 13 +++++++++---- .github/workflows/build-go-test.yml | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-docker-test.yml b/.github/workflows/build-docker-test.yml index 6ab63fb..1e4435f 100644 --- a/.github/workflows/build-docker-test.yml +++ b/.github/workflows/build-docker-test.yml @@ -1,6 +1,6 @@ on: [push] jobs: - test_docker: + test_build_docker: uses: ./.github/workflows/build-docker.yml with: - tag: 'test' + tag: 'forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/build/test:latest' diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index fdb9644..d92fde1 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -3,8 +3,13 @@ name: Build Docker Container on: workflow_call: inputs: - source: - description: 'The source directory to build' + dockerfile: + description: 'The dockerfile to build' + required: false + type: string + default: './Dockerfile' + context: + description: 'The build context' required: false type: string default: './' @@ -17,10 +22,10 @@ jobs: build-go: runs-on: docker container: - image: forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/pipeline-container/dind:27.4.0-rc2 + image: gcr.io/kaniko-project/executor:v1.23.2 steps: - name: Clone Repository uses: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/checkout@main - name: Build Docker Container run: | - docker build -t ${{ inputs.tag }} ${{ inputs.source }} + ~/run_in_docker.sh ${{ inputs.dockerfile }} ${{ inputs.context }} ${{ inputs.tag }} diff --git a/.github/workflows/build-go-test.yml b/.github/workflows/build-go-test.yml index d5d6dd3..0ac8d51 100644 --- a/.github/workflows/build-go-test.yml +++ b/.github/workflows/build-go-test.yml @@ -1,6 +1,6 @@ on: [push] jobs: - test_build: + test_build_go: uses: ./.github/workflows/build-go.yml with: go-version: '1.23'