From cb563d3b0619a67cde4382a34a457a2e0e1996fc Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 09:35:03 +0200 Subject: [PATCH 1/9] update actions --- .gitea/workflows/docker.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index d44b20b..07438c5 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -4,10 +4,9 @@ run-name: ${{ gitea.actor }} testing docker builder on: push: - branches: none #[ main ] - #paths: .github/workflows/1-actions-ci-cd-aks.yml + #branches: none #[ main ] pull_request: - branches: none # [ main ] + #branches: none # [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -26,8 +25,8 @@ jobs: uses: docker/login-action@v2 with: registry: gitea.ocram85.com - username: ${{ secrets.GITEA_USERNAME }} - password: ${{ secrets.GITEA_TOKEN }} + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} - name: Build and push uses: docker/build-push-action@v4 -- 2.45.2 From 721595afc4a7705bcc0606cdca9457b4c48f2067 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 09:43:39 +0200 Subject: [PATCH 2/9] fix actions url --- .gitea/workflows/docker.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 07438c5..11bda46 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -16,20 +16,20 @@ jobs: steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: setup-buildx-action@v2 - name: Login to Gitea Package Registry - uses: docker/login-action@v2 + uses: login-action@v2 with: registry: gitea.ocram85.com username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - name: Build and push - uses: docker/build-push-action@v4 + uses: build-push-action@v4 with: push: false #true tags: gitea.ocram85.com/ocram85/swarmproxy:next -- 2.45.2 From 120c49e0ddb3f72ea34a38c7c211cd842144871b Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 09:48:29 +0200 Subject: [PATCH 3/9] fix actions url --- .gitea/workflows/docker.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 11bda46..02f26e6 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -16,20 +16,20 @@ jobs: steps: - name: Set up QEMU - uses: setup-qemu-action@v2 + uses: actions/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: setup-buildx-action@v2 + uses: actions/setup-buildx-action@v2 - name: Login to Gitea Package Registry - uses: login-action@v2 + uses: actions/login-action@v2 with: registry: gitea.ocram85.com username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - name: Build and push - uses: build-push-action@v4 + uses: actions/build-push-action@v4 with: push: false #true tags: gitea.ocram85.com/ocram85/swarmproxy:next -- 2.45.2 From ef28848d2cdf12c4cf58ea270db129075a9efd83 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 09:52:11 +0200 Subject: [PATCH 4/9] disable qemu for testing --- .gitea/workflows/docker.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 02f26e6..dedfce8 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -14,9 +14,9 @@ jobs: build-container: runs-on: ubuntu-latest steps: - - - name: Set up QEMU - uses: actions/setup-qemu-action@v2 + #- + # name: Set up QEMU + # uses: actions/setup-qemu-action@v2 - name: Set up Docker Buildx uses: actions/setup-buildx-action@v2 -- 2.45.2 From 0b127ccd9c9877790997d9bc7adb4dd8d373daff Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 14:17:39 +0200 Subject: [PATCH 5/9] use custom runner with docker installed --- .gitea/workflows/docker.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index dedfce8..09472b2 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -13,6 +13,8 @@ on: jobs: build-container: runs-on: ubuntu-latest + container: + image: catthehacker/ubuntu:act-latest steps: #- # name: Set up QEMU -- 2.45.2 From a1d5323b13c007afeb2ad5aba24c44149c84802c Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 15:17:27 +0200 Subject: [PATCH 6/9] test creds --- .gitea/workflows/docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 09472b2..7d42860 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -33,5 +33,5 @@ jobs: name: Build and push uses: actions/build-push-action@v4 with: - push: false #true - tags: gitea.ocram85.com/ocram85/swarmproxy:next + push: true + tags: gitea.ocram85.com/ocram85/swarmproxy:next2 -- 2.45.2 From 3de1e0b0b77b0ea6f6953d4a60e98b39635e5ec7 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Thu, 6 Jul 2023 15:21:22 +0200 Subject: [PATCH 7/9] test token based auth --- .gitea/workflows/docker.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index 7d42860..b75a950 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -28,7 +28,8 @@ jobs: with: registry: gitea.ocram85.com username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} + #password: ${{ secrets.PASSWORD }} + password: ${{ secrets.TOKEN }} - name: Build and push uses: actions/build-push-action@v4 -- 2.45.2 From a07c8450429e4755d53327cbcbbcabd35354e752 Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 10 Jul 2023 11:44:43 +0200 Subject: [PATCH 8/9] test ci --- .gitea/workflows/deploy.yaml | 51 ++++++++++++++++++++++++++++++++++++ .gitea/workflows/docker.yaml | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/deploy.yaml diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml new file mode 100644 index 0000000..f2460ed --- /dev/null +++ b/.gitea/workflows/deploy.yaml @@ -0,0 +1,51 @@ +name: docker + +run-name: Container Image Deployment + +on: + push: + branches: + - 'master' + tags: + - 'v*' + +jobs: + build-container: + runs-on: ubuntu-latest + container: + image: catthehacker/ubuntu:act-latest + steps: + - + name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + ocram85/swarmproxy + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + - + name: Set up QEMU + uses: actions/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: actions/setup-buildx-action@v2 + - + name: Login to Gitea Package Registry + uses: actions/login-action@v2 + with: + registry: gitea.ocram85.com + username: ${{ secrets.USERNAME }} + #password: ${{ secrets.PASSWORD }} + password: ${{ secrets.TOKEN }} + - + name: Build and push + uses: actions/build-push-action@v4 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + #tags: gitea.ocram85.com/ocram85/swarmproxy:next2 + diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml index b75a950..7643689 100644 --- a/.gitea/workflows/docker.yaml +++ b/.gitea/workflows/docker.yaml @@ -34,5 +34,5 @@ jobs: name: Build and push uses: actions/build-push-action@v4 with: - push: true + push: false tags: gitea.ocram85.com/ocram85/swarmproxy:next2 -- 2.45.2 From 376e87b31487b1a97e8fcb2d052a1944707504eb Mon Sep 17 00:00:00 2001 From: OCram85 Date: Mon, 10 Jul 2023 11:50:51 +0200 Subject: [PATCH 9/9] disable woodpecker pipelines --- .woodpecker/{.deploy.yml => .deploy.yml.disabled} | 0 .woodpecker/{.next.yml => .next.yml.disabled} | 0 .woodpecker/{.test.yml => .test.yml.disabled} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .woodpecker/{.deploy.yml => .deploy.yml.disabled} (100%) rename .woodpecker/{.next.yml => .next.yml.disabled} (100%) rename .woodpecker/{.test.yml => .test.yml.disabled} (100%) diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml.disabled similarity index 100% rename from .woodpecker/.deploy.yml rename to .woodpecker/.deploy.yml.disabled diff --git a/.woodpecker/.next.yml b/.woodpecker/.next.yml.disabled similarity index 100% rename from .woodpecker/.next.yml rename to .woodpecker/.next.yml.disabled diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml.disabled similarity index 100% rename from .woodpecker/.test.yml rename to .woodpecker/.test.yml.disabled -- 2.45.2