From a24a020fc79b1f6311e9b84e3a9c09d7a530b9ee Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Mon, 22 Apr 2024 16:45:41 +0100 Subject: [PATCH 01/10] add docker container repo push --- .gitea/workflows/publish-docker.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .gitea/workflows/publish-docker.yaml diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml new file mode 100644 index 0000000..97ab695 --- /dev/null +++ b/.gitea/workflows/publish-docker.yaml @@ -0,0 +1,19 @@ +name: Build and Publish drop-in-url-previews +run-name: Build and Publish drop-in-url-previews +on: [push] + +jobs: + build_and_publish: + runs-on: ubuntu-latest + steps: + - name: Check out repository code + uses: actions/checkout@v4 + - name: Build Docker image + run: | + docker build -t git.i-am.nexus/nex/drop-in-url-previews:latest . + - name: Log into container registry + run: | + docker login -u ${{ secrets.CR_USERNAME }} -p ${{ secrets.CR_PASSWORD }} git.i-am.nexus + - name: Push to container registry + run: | + docker push git.i-am.nexus/nex/drop-in-url-previews:latest \ No newline at end of file From 3bde3bf3b0070915aa24ca0ebaaa383ef21cb3a5 Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 08:49:23 +0100 Subject: [PATCH 02/10] Migrate docker builder --- .gitea/workflows/publish-docker.yaml | 54 +++++++++++++++++++++------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 97ab695..a766905 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -1,19 +1,47 @@ -name: Build and Publish drop-in-url-previews -run-name: Build and Publish drop-in-url-previews +name: Publish Docker image + on: [push] +env: + REGISTRY: git.i-am.nexus + IMAGE_NAME: drop-in-url-previews + jobs: - build_and_publish: + push_to_registry: + name: Push Docker image to Docker Hub runs-on: ubuntu-latest + permissions: + packages: write + contents: read + attestations: write + pages: write + id-token: write + steps: - - name: Check out repository code + - name: Checkout repository uses: actions/checkout@v4 - - name: Build Docker image - run: | - docker build -t git.i-am.nexus/nex/drop-in-url-previews:latest . - - name: Log into container registry - run: | - docker login -u ${{ secrets.CR_USERNAME }} -p ${{ secrets.CR_PASSWORD }} git.i-am.nexus - - name: Push to container registry - run: | - docker push git.i-am.nexus/nex/drop-in-url-previews:latest \ No newline at end of file + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to CR + uses: docker/login-action@v3 + with: + registry: git.i-am.nexus + username: nex + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image + id: push + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max \ No newline at end of file From c8898d62250a7574e45c671a69fb96c1c909d5f1 Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:08:04 +0100 Subject: [PATCH 03/10] Fix publish Signed-off-by: nex --- .gitea/workflows/publish-docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index a766905..3f97252 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -34,7 +34,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/nex/${{ env.IMAGE_NAME }} - name: Build and push Docker image id: push uses: docker/build-push-action@v5 @@ -44,4 +44,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha - cache-to: type=gha,mode=max \ No newline at end of file + cache-to: type=gha,mode=max From 13e0280132014051c4ec3415afe441113a734b8b Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:13:45 +0100 Subject: [PATCH 04/10] Revert workflow Signed-off-by: nex --- .gitea/workflows/publish-docker.yaml | 37 +++++++--------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 3f97252..37d7257 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -1,22 +1,10 @@ -name: Publish Docker image - +name: Build and Publish drop-in-url-previews +run-name: Build and Publish drop-in-url-previews on: [push] -env: - REGISTRY: git.i-am.nexus - IMAGE_NAME: drop-in-url-previews - jobs: - push_to_registry: - name: Push Docker image to Docker Hub + build_and_publish: runs-on: ubuntu-latest - permissions: - packages: write - contents: read - attestations: write - pages: write - id-token: write - steps: - name: Checkout repository uses: actions/checkout@v4 @@ -24,24 +12,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to CR + - name: Login to git.i-am.nexus uses: docker/login-action@v3 with: registry: git.i-am.nexus - username: nex + username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/nex/${{ env.IMAGE_NAME }} - - name: Build and push Docker image - id: push - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max + images: git.i-am.nexus/nex/drop-in-url-previews + - name: Push to container registry + run: | + docker push -a git.i-am.nexus/nex/drop-in-url-previews \ No newline at end of file From 46aa84947b4fb4ecad913f826f21ce42c75419e1 Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:19:40 +0100 Subject: [PATCH 05/10] Re-fix --- .gitea/workflows/publish-docker.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 37d7257..e19be0b 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -23,6 +23,13 @@ jobs: uses: docker/metadata-action@v5 with: images: git.i-am.nexus/nex/drop-in-url-previews + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: false + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Push to container registry run: | docker push -a git.i-am.nexus/nex/drop-in-url-previews \ No newline at end of file From 64279f3515eb3dc49accdc2daedece84742454a8 Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:22:04 +0100 Subject: [PATCH 06/10] Update .gitea/workflows/publish-docker.yaml --- .gitea/workflows/publish-docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index e19be0b..49ae45a 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -28,6 +28,7 @@ jobs: with: context: . push: false + load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Push to container registry From ceb1c4afe44635a1a7576ecfb18d00c1feba491b Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:24:35 +0100 Subject: [PATCH 07/10] Use the correct credentials --- .gitea/workflows/publish-docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 49ae45a..312fc68 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -16,8 +16,8 @@ jobs: uses: docker/login-action@v3 with: registry: git.i-am.nexus - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + username: ${{ secrets.CR_USERNAME }} + password: ${{ secrets.CR_PASSWORD }} - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v5 From 30571cf12642f3d28a5baa003d249c62a68ed5f4 Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:29:06 +0100 Subject: [PATCH 08/10] multi-arch build! --- .gitea/workflows/publish-docker.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 312fc68..1773244 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -9,10 +9,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to git.i-am.nexus + - name: Login to repo uses: docker/login-action@v3 with: registry: git.i-am.nexus @@ -23,7 +26,7 @@ jobs: uses: docker/metadata-action@v5 with: images: git.i-am.nexus/nex/drop-in-url-previews - - name: Build and push + - name: Build uses: docker/build-push-action@v5 with: context: . @@ -31,6 +34,7 @@ jobs: load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - name: Push to container registry + platforms: linux/amd64,linux/arm64 + - name: Push run: | docker push -a git.i-am.nexus/nex/drop-in-url-previews \ No newline at end of file From e468b63be506fae953aef990da4f095d08d8263e Mon Sep 17 00:00:00 2001 From: nex Date: Wed, 29 May 2024 09:33:24 +0100 Subject: [PATCH 09/10] Nevermind, unsupported --- .gitea/workflows/publish-docker.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/publish-docker.yaml b/.gitea/workflows/publish-docker.yaml index 1773244..ae67f85 100644 --- a/.gitea/workflows/publish-docker.yaml +++ b/.gitea/workflows/publish-docker.yaml @@ -9,9 +9,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -34,7 +31,6 @@ jobs: load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 - name: Push run: | docker push -a git.i-am.nexus/nex/drop-in-url-previews \ No newline at end of file From 1d8797889d2b6dfce6e0ab01107a77ed893a88b5 Mon Sep 17 00:00:00 2001 From: nex Date: Thu, 30 May 2024 22:27:36 +0100 Subject: [PATCH 10/10] there are in fact pre-built images --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e86f802..ce04a33 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ services: container_name: "dendrite-url-previews" volumes: - url_previews:/app/data/ - build: . # there's no pre-built image + image: git.i-am.nexus/nex/drop-in-url-previews:master volumes: url_previews: