From 2ef4515e16024f1ffb939c957165e07e41d10ae4 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 30 Jul 2023 20:43:57 +0200 Subject: [PATCH 1/7] use k3s runner Signed-off-by: Roger Sikorski --- .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 c00e210..aaab918 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -16,7 +16,7 @@ jobs: build: needs: Dockerfile lint - runs-on: docker + runs-on: k3s steps: - uses: actions/checkout@v3 - name: Pull Docker Image for caching -- 2.49.1 From 3983f83797308ea176c64f6456843e440a6aad82 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 30 Jul 2023 20:46:22 +0200 Subject: [PATCH 2/7] try kaniko build Signed-off-by: Roger Sikorski --- .gitea/workflows/dev.yaml | 58 +++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index aaab918..0525225 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,26 +6,48 @@ on: - main jobs: - Dockerfile lint: - runs-on: k3s - steps: - - uses: actions/checkout@v3 - - uses: hadolint/hadolint-action@v3.1.0 - with: - dockerfile: Dockerfile + # Dockerfile lint: + # runs-on: k3s + # steps: + # - uses: actions/checkout@v3 + # - uses: hadolint/hadolint-action@v3.1.0 + # with: + # dockerfile: Dockerfile + + # build: + # # needs: Dockerfile lint + # runs-on: k3s + # steps: + # - uses: actions/checkout@v3 + # - name: Pull Docker Image for caching + # run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 + # - name: Build docker image + # run: | + # docker build . \ + # --cache-from gitea.sikorski.cloud/rogersik/monica:development \ + # --file Dockerfile \ + # --tag gitea.sikorski.cloud/rogersik/monica:development + # - name: Push docker image + # run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags build: - needs: Dockerfile lint + # needs: Dockerfile lint runs-on: k3s steps: - uses: actions/checkout@v3 - - name: Pull Docker Image for caching - run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 - - name: Build docker image - run: | - docker build . \ - --cache-from gitea.sikorski.cloud/rogersik/monica:development \ - --file Dockerfile \ - --tag gitea.sikorski.cloud/rogersik/monica:development - - name: Push docker image - run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags + - name: Kaniko build + uses: aevea/action-kaniko@master + with: + image: gitea.sikorski.cloud/rogersik/monica + tag: development + + # - name: Pull Docker Image for caching + # run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 + # - name: Build docker image + # run: | + # docker build . \ + # --cache-from gitea.sikorski.cloud/rogersik/monica:development \ + # --file Dockerfile \ + # --tag gitea.sikorski.cloud/rogersik/monica:development + # - name: Push docker image + # run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags -- 2.49.1 From 33b2ffe6808f6233253b935e89bfbe4f7aa5aae5 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 30 Jul 2023 20:50:12 +0200 Subject: [PATCH 3/7] try with kaniko image Signed-off-by: Roger Sikorski --- .gitea/workflows/dev.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 0525225..1a6c7f6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -33,6 +33,8 @@ jobs: build: # needs: Dockerfile lint runs-on: k3s + container: + image: gcr.io/kaniko-project/executor:v1.9.0-debug steps: - uses: actions/checkout@v3 - name: Kaniko build -- 2.49.1 From 3d8e5e15a288e3516109137be7f43824e47e7c14 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 30 Jul 2023 20:51:02 +0200 Subject: [PATCH 4/7] removed not used code Signed-off-by: Roger Sikorski --- .gitea/workflows/dev.yaml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 1a6c7f6..39dc781 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -14,27 +14,9 @@ jobs: # with: # dockerfile: Dockerfile - # build: - # # needs: Dockerfile lint - # runs-on: k3s - # steps: - # - uses: actions/checkout@v3 - # - name: Pull Docker Image for caching - # run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 - # - name: Build docker image - # run: | - # docker build . \ - # --cache-from gitea.sikorski.cloud/rogersik/monica:development \ - # --file Dockerfile \ - # --tag gitea.sikorski.cloud/rogersik/monica:development - # - name: Push docker image - # run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags - build: # needs: Dockerfile lint runs-on: k3s - container: - image: gcr.io/kaniko-project/executor:v1.9.0-debug steps: - uses: actions/checkout@v3 - name: Kaniko build @@ -42,14 +24,3 @@ jobs: with: image: gitea.sikorski.cloud/rogersik/monica tag: development - - # - name: Pull Docker Image for caching - # run: docker pull gitea.sikorski.cloud/rogersik/monica:development || exit 0 - # - name: Build docker image - # run: | - # docker build . \ - # --cache-from gitea.sikorski.cloud/rogersik/monica:development \ - # --file Dockerfile \ - # --tag gitea.sikorski.cloud/rogersik/monica:development - # - name: Push docker image - # run: docker push gitea.sikorski.cloud/rogersik/monica --all-tags -- 2.49.1 From 2fed4e69dfc09a5b1788cd7151f56df7f12412e9 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Tue, 1 Aug 2023 07:17:32 +0200 Subject: [PATCH 5/7] switched to runs-on: docker Signed-off-by: Roger Sikorski --- .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 39dc781..96a911e 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -16,7 +16,7 @@ jobs: build: # needs: Dockerfile lint - runs-on: k3s + runs-on: docker # because of ipv4 problem in k3s we use docker vm steps: - uses: actions/checkout@v3 - name: Kaniko build -- 2.49.1 From 62613bbe5d03a7a745f9cbe8acd76838f4e2a047 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Tue, 1 Aug 2023 07:18:54 +0200 Subject: [PATCH 6/7] switch to fixed version Signed-off-by: Roger Sikorski --- .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 96a911e..b975fc6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Kaniko build - uses: aevea/action-kaniko@master + uses: aevea/action-kaniko@v0.10.0 with: image: gitea.sikorski.cloud/rogersik/monica tag: development -- 2.49.1 From 89b12cd413235dd00ebcfd0c68ecb9ffbb8611f6 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Tue, 1 Aug 2023 07:23:14 +0200 Subject: [PATCH 7/7] try kaniko Signed-off-by: Roger Sikorski --- .gitea/workflows/dev.yaml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index b975fc6..65ab6e7 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -14,13 +14,26 @@ jobs: # with: # dockerfile: Dockerfile + # build: + # # needs: Dockerfile lint + # runs-on: docker # because of ipv4 problem in k3s we use docker vm + # steps: + # - uses: actions/checkout@v3 + # - name: Kaniko build + # uses: aevea/action-kaniko@v0.10.0 + # with: + # image: gitea.sikorski.cloud/rogersik/monica + # tag: development + build: # needs: Dockerfile lint runs-on: docker # because of ipv4 problem in k3s we use docker vm + container: + image: gcr.io/kaniko-project/executor:v1.9.0-debug steps: - uses: actions/checkout@v3 - - name: Kaniko build - uses: aevea/action-kaniko@v0.10.0 - with: - image: gitea.sikorski.cloud/rogersik/monica - tag: development + - run: | + /kaniko/executor + --context . + --dockerfile ./Dockerfile" + --destination gitea.sikorski.cloud/rogersik/monica:development -- 2.49.1