From bda5ebd2054883635038feb0065a845c6c0da9e4 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:13:34 +0200 Subject: [PATCH 01/25] deleted .drone.yml --- .drone.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 95d5a5e..0000000 --- a/.drone.yml +++ /dev/null @@ -1,29 +0,0 @@ -kind: pipeline -name: default - -steps: -- name: build and publish docker image - image: plugins/docker - settings: - storage_driver: vfs # required for Synology Docker - username: - from_secret: "Docker_Hub_Username" - password: - from_secret: "Docker_Hub_Token" - repo: rogersik/admin-helper - tags: latest - -- name: notify - image: drillster/drone-email - settings: - host: mailcow.basecom.de - from: - from_secret: "Notifications_Address" - username: - from_secret: "Notifications_Address" - password: - from_secret: "Notifications_Address_Password" - recipients: - from_secret: "Notifications_Address_Recipients" - when: - status: [ failure ] \ No newline at end of file -- 2.45.2 From 10fb6bdf9bb1918f5fbf911cf118b85a38f310fb Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:14:51 +0200 Subject: [PATCH 02/25] first version of gitea workflow --- .gitea/workflows/dev.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .gitea/workflows/dev.yaml diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml new file mode 100644 index 0000000..41d60fd --- /dev/null +++ b/.gitea/workflows/dev.yaml @@ -0,0 +1,20 @@ +on: + push: + branches-ignore: + - main + +jobs: + build: + runs-on: docker + steps: + - uses: actions/checkout@v3 + - name: Pull Docker Image for caching + run: docker pull gitea.sikorski.cloud/RogerSik/docker-admin-helper:development || exit 0 + - name: Build docker image + run: | + docker build . \ + --cache-from gitea.sikorski.cloud/RogerSik/docker-admin-helper:development \ + --file Dockerfile \ + --tag gitea.sikorski.cloud/RogerSik/docker-admin-helper:development + - name: Push docker image + run: docker push gitea.sikorski.cloud/RogerSik/docker-admin-helper --all-tags -- 2.45.2 From 557d789bfaa524f628124a36fbeb5fc9d1db8910 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:15:39 +0200 Subject: [PATCH 03/25] push commit --- .gitea/workflows/dev.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 41d60fd..0964653 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -18,3 +18,4 @@ jobs: --tag gitea.sikorski.cloud/RogerSik/docker-admin-helper:development - name: Push docker image run: docker push gitea.sikorski.cloud/RogerSik/docker-admin-helper --all-tags + -- 2.45.2 From 4773956071d658db5e02b4c3870c27af14a8fb7b Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:16:23 +0200 Subject: [PATCH 04/25] set lowercase url --- .gitea/workflows/dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 0964653..ea386a4 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,13 +9,13 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pull Docker Image for caching - run: docker pull gitea.sikorski.cloud/RogerSik/docker-admin-helper:development || exit 0 + run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - name: Build docker image run: | docker build . \ - --cache-from gitea.sikorski.cloud/RogerSik/docker-admin-helper:development \ + --cache-from gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ --file Dockerfile \ - --tag gitea.sikorski.cloud/RogerSik/docker-admin-helper:development + --tag gitea.sikorski.cloud/rogersik/docker-admin-helper:development - name: Push docker image - run: docker push gitea.sikorski.cloud/RogerSik/docker-admin-helper --all-tags + run: docker push gitea.sikorski.cloud/rogersik/docker-admin-helper --all-tags -- 2.45.2 From ea23ca2f8b1aeadb820460d88ba113fc9e88df19 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:20:44 +0200 Subject: [PATCH 05/25] docker login added --- .gitea/workflows/dev.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index ea386a4..2dbb3f1 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -8,6 +8,8 @@ jobs: runs-on: docker steps: - uses: actions/checkout@v3 + - name: docker login + run: docker login -u $REGISTRY_USER -p $ REGISTRY_PASSWORD gitea.sikorski.cloud - name: Pull Docker Image for caching run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - name: Build docker image -- 2.45.2 From e552957987651d173324851e6dc447363d316d1a Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:21:05 +0200 Subject: [PATCH 06/25] 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 2dbb3f1..02a3502 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: docker login - run: docker login -u $REGISTRY_USER -p $ REGISTRY_PASSWORD gitea.sikorski.cloud + run: docker login -u$REGISTRY_USER -p$REGISTRY_PASSWORD gitea.sikorski.cloud - name: Pull Docker Image for caching run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - name: Build docker image -- 2.45.2 From 6f848424827ca74dbf297f149d0012e8da96c7b5 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:22:03 +0200 Subject: [PATCH 07/25] update --- .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 02a3502..587cf12 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: docker login - run: docker login -u$REGISTRY_USER -p$REGISTRY_PASSWORD gitea.sikorski.cloud + run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud - name: Pull Docker Image for caching run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - name: Build docker image -- 2.45.2 From 46621ebb1b9c75f78d7ab7cb8de59b0a024c09f1 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:22:55 +0200 Subject: [PATCH 08/25] try k3s as build --- .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 587cf12..f573bbc 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -5,7 +5,7 @@ on: jobs: build: - runs-on: docker + runs-on: k3s steps: - uses: actions/checkout@v3 - name: docker login -- 2.45.2 From 63d221306290447aee337f031ae3f077339ef81a Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:23:55 +0200 Subject: [PATCH 09/25] docker image added --- .gitea/workflows/dev.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index f573bbc..892ef07 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,6 +6,8 @@ on: jobs: build: runs-on: k3s + container: + image: docker:24-cli steps: - uses: actions/checkout@v3 - name: docker login -- 2.45.2 From 600dc7f66a901b68989ad6e5c54635bd9a00e7c7 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:28:40 +0200 Subject: [PATCH 10/25] use actions --- .gitea/workflows/dev.yaml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 892ef07..5fbfc93 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,20 +6,18 @@ on: jobs: build: runs-on: k3s - container: - image: docker:24-cli +# container: +# image: docker:24-cli steps: - uses: actions/checkout@v3 - name: docker login - run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud - - name: Pull Docker Image for caching - run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - - name: Build docker image - run: | - docker build . \ - --cache-from gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ - --file Dockerfile \ - --tag gitea.sikorski.cloud/rogersik/docker-admin-helper:development - - name: Push docker image - run: docker push gitea.sikorski.cloud/rogersik/docker-admin-helper --all-tags - + uses: docker/login-action@v2 + with: + registry: "gitea.sikorski.cloud" + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} + - name: Build and push + uses: docker/build-push-action@v4 + with: + push: true + tags: gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ No newline at end of file -- 2.45.2 From d794d30f03271efaae29432ee1809d8965d2016d Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:29:30 +0200 Subject: [PATCH 11/25] update --- .gitea/workflows/dev.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 5fbfc93..e4abbe6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,10 +6,10 @@ on: jobs: build: runs-on: k3s -# container: -# image: docker:24-cli + container: + image: docker:24-cli steps: - - uses: actions/checkout@v3 +# - uses: actions/checkout@v3 - name: docker login uses: docker/login-action@v2 with: -- 2.45.2 From 76f3627ad69e2201de7d8dfc71adc6c0be03da11 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:30:29 +0200 Subject: [PATCH 12/25] nodejs installation added --- .gitea/workflows/dev.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index e4abbe6..ac27747 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,7 +9,9 @@ jobs: container: image: docker:24-cli steps: + - run: apk --no-cache add nodejs # - uses: actions/checkout@v3 + - name: docker login uses: docker/login-action@v2 with: -- 2.45.2 From 984c36e8a3fa363093fa2d0c0163a84fd57a68f6 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:33:00 +0200 Subject: [PATCH 13/25] try kaniko build --- .gitea/workflows/dev.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index ac27747..e06eef6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -7,19 +7,23 @@ jobs: build: runs-on: k3s container: - image: docker:24-cli + image: alpine:latest steps: - run: apk --no-cache add nodejs -# - uses: actions/checkout@v3 - + - uses: actions/checkout@v3 - name: docker login uses: docker/login-action@v2 with: registry: "gitea.sikorski.cloud" username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Build and push - uses: docker/build-push-action@v4 + - name: Kaniko build + uses: aevea/action-kaniko@master with: - push: true - tags: gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ No newline at end of file + registry: gitea.sikorski.cloud + image: rogersik/docker-admin-helper + tag: development + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_PASSWORD }} + cache: true + cache_registry: rogersik/docker-admin-helper \ No newline at end of file -- 2.45.2 From c2fa2865772a4510a4880b7359948d9a4407e68f Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:33:29 +0200 Subject: [PATCH 14/25] git added to install --- .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 e06eef6..9a0ebe4 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,7 +9,7 @@ jobs: container: image: alpine:latest steps: - - run: apk --no-cache add nodejs + - run: apk --no-cache add nodejs git - uses: actions/checkout@v3 - name: docker login uses: docker/login-action@v2 -- 2.45.2 From f04c3c7303147493f49f079d100221be273d2f86 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:34:25 +0200 Subject: [PATCH 15/25] docker login not more needed for kaniko build --- .gitea/workflows/dev.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 9a0ebe4..a8897b6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -11,12 +11,6 @@ jobs: steps: - run: apk --no-cache add nodejs git - uses: actions/checkout@v3 - - name: docker login - uses: docker/login-action@v2 - with: - registry: "gitea.sikorski.cloud" - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - name: Kaniko build uses: aevea/action-kaniko@master with: -- 2.45.2 From adccdc5b4e6ccbd8f74c7668ffc4c525e2764e98 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:35:31 +0200 Subject: [PATCH 16/25] switched to docker runner --- .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 a8897b6..f3d91d5 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -5,7 +5,7 @@ on: jobs: build: - runs-on: k3s + runs-on: docker container: image: alpine:latest steps: -- 2.45.2 From fdcacde07cabb3f2aad8a515ae5d8e24ce442e81 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:36:34 +0200 Subject: [PATCH 17/25] build_file argument added --- .gitea/workflows/dev.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index f3d91d5..a165f6b 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -20,4 +20,5 @@ jobs: username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} cache: true - cache_registry: rogersik/docker-admin-helper \ No newline at end of file + cache_registry: rogersik/docker-admin-helper + build_file: Dockerfile \ No newline at end of file -- 2.45.2 From 7e8a10d3633a0866d15ee61abbdd2130766f5e5b Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Sun, 23 Jul 2023 19:36:54 +0200 Subject: [PATCH 18/25] path added to dockerfile --- .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 a165f6b..44006fb 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -21,4 +21,4 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} cache: true cache_registry: rogersik/docker-admin-helper - build_file: Dockerfile \ No newline at end of file + build_file: ./Dockerfile \ No newline at end of file -- 2.45.2 From 3c19399da5f76b03ba544318d5a8c7f74d8fc7c2 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:52:32 +0200 Subject: [PATCH 19/25] switch back to docker build --- .gitea/workflows/dev.yaml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 44006fb..66485eb 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -1,24 +1,28 @@ on: push: branches-ignore: - - main + - development jobs: build: - runs-on: docker + runs-on: k3s container: - image: alpine:latest + image: alpine:3 steps: - - run: apk --no-cache add nodejs git + - run: apk --no-cache add nodejs git docker - uses: actions/checkout@v3 - - name: Kaniko build - uses: aevea/action-kaniko@master - with: - registry: gitea.sikorski.cloud - image: rogersik/docker-admin-helper - tag: development - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - cache: true - cache_registry: rogersik/docker-admin-helper - build_file: ./Dockerfile \ No newline at end of file + - name: docker login + run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud + env: + REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + - name: Pull Docker Image for caching + run: docker pull registry.sikorski.cloud/docker-admin-helper/ansible:development || exit 0 + - name: Build docker image + run: | + docker build . \ + --cache-from registry.sikorski.cloud/docker-admin-helper/ansible:development \ + --file Dockerfile \ + --tag registry.sikorski.cloud/docker-admin-helper/ansible:development + - name: Push docker image + run: docker push registry.sikorski.cloud/docker-admin-helper/ansible --all-tags -- 2.45.2 From ff01619083444c648b97437813cc2a6591f20a72 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:53:34 +0200 Subject: [PATCH 20/25] use docker image --- .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 66485eb..0785bb3 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -7,7 +7,7 @@ jobs: build: runs-on: k3s container: - image: alpine:3 + image: docker-24-cli steps: - run: apk --no-cache add nodejs git docker - uses: actions/checkout@v3 -- 2.45.2 From 45bf431fce0dc4afe04d497787130f503ab4898d Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:53:53 +0200 Subject: [PATCH 21/25] typo in image tag --- .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 0785bb3..f4253a6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -7,7 +7,7 @@ jobs: build: runs-on: k3s container: - image: docker-24-cli + image: docker:24-cli steps: - run: apk --no-cache add nodejs git docker - uses: actions/checkout@v3 -- 2.45.2 From 3c9698a890e6ea789596bfe208a8f6f7b40c3700 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:54:21 +0200 Subject: [PATCH 22/25] use vm runner --- .gitea/workflows/dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index f4253a6..0041636 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -5,11 +5,11 @@ on: jobs: build: - runs-on: k3s + runs-on: docker container: image: docker:24-cli steps: - - run: apk --no-cache add nodejs git docker + - run: apk --no-cache add nodejs git - uses: actions/checkout@v3 - name: docker login run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud -- 2.45.2 From 95bc6926636faa82db3942639bf2363e5f7f3bee Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:55:33 +0200 Subject: [PATCH 23/25] removed copy-pasta code --- .gitea/workflows/dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 0041636..28767c1 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -17,12 +17,12 @@ jobs: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - name: Pull Docker Image for caching - run: docker pull registry.sikorski.cloud/docker-admin-helper/ansible:development || exit 0 + run: docker pull registry.sikorski.cloud/docker-admin-helper:development || exit 0 - name: Build docker image run: | docker build . \ - --cache-from registry.sikorski.cloud/docker-admin-helper/ansible:development \ + --cache-from registry.sikorski.cloud/docker-admin-helper:development \ --file Dockerfile \ - --tag registry.sikorski.cloud/docker-admin-helper/ansible:development + --tag registry.sikorski.cloud/docker-admin-helper:development - name: Push docker image - run: docker push registry.sikorski.cloud/docker-admin-helper/ansible --all-tags + run: docker push registry.sikorski.cloud/docker-admin-helper --all-tags -- 2.45.2 From 775e0f17ebdd8be022485558064f704639ea7401 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:56:55 +0200 Subject: [PATCH 24/25] changed registry --- .gitea/workflows/dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 28767c1..20163f3 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -17,12 +17,12 @@ jobs: REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - name: Pull Docker Image for caching - run: docker pull registry.sikorski.cloud/docker-admin-helper:development || exit 0 + run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0 - name: Build docker image run: | docker build . \ - --cache-from registry.sikorski.cloud/docker-admin-helper:development \ + --cache-from gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ --file Dockerfile \ - --tag registry.sikorski.cloud/docker-admin-helper:development + --tag gitea.sikorski.cloud/rogersik//docker-admin-helper:development - name: Push docker image - run: docker push registry.sikorski.cloud/docker-admin-helper --all-tags + run: docker push gitea.sikorski.cloud/rogersik/docker-admin-helper --all-tags -- 2.45.2 From 93d682979e4b82a2c19a6b39503dbf60ebe05866 Mon Sep 17 00:00:00 2001 From: Roger Sikorski Date: Mon, 24 Jul 2023 06:57:22 +0200 Subject: [PATCH 25/25] 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 20163f3..1f43273 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -23,6 +23,6 @@ jobs: docker build . \ --cache-from gitea.sikorski.cloud/rogersik/docker-admin-helper:development \ --file Dockerfile \ - --tag gitea.sikorski.cloud/rogersik//docker-admin-helper:development + --tag gitea.sikorski.cloud/rogersik/docker-admin-helper:development - name: Push docker image run: docker push gitea.sikorski.cloud/rogersik/docker-admin-helper --all-tags -- 2.45.2