From 91154d46ad06aaf9a80f1cc0a8c8913b8cf02536 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 6 Jul 2025 17:20:48 +1000 Subject: [PATCH] feat: update urls - update docker images to use git.unkin.net - update path to save rpms to git.unkin.net --- .gitea/workflows/build.yaml | 4 ++-- .gitea/workflows/deploy.yaml | 12 ++++++------ rpms/boilerplate/Dockerfile | 2 +- rpms/cni-plugins/Dockerfile | 2 +- rpms/consul-cni/Dockerfile | 2 +- rpms/consul/Dockerfile | 2 +- rpms/etcd/Dockerfile | 2 +- rpms/g10k/Dockerfile | 2 +- rpms/incus/Dockerfile | 2 +- rpms/jellyfin-ffmpeg-bin/Dockerfile | 2 +- rpms/jellyfin-server/Dockerfile | 2 +- rpms/jellyfin-web/Dockerfile | 2 +- rpms/nfpm/Dockerfile | 2 +- rpms/node_exporter/Dockerfile | 2 +- rpms/nomad-autoscaler/Dockerfile | 2 +- rpms/nomad/Dockerfile | 2 +- rpms/nzbget/Dockerfile | 2 +- rpms/packer/Dockerfile | 2 +- rpms/puppet-initial/Dockerfile | 2 +- rpms/ruff/Dockerfile | 2 +- rpms/terraform/Dockerfile | 2 +- rpms/terragrunt/Dockerfile | 2 +- rpms/unkin-ca-certificates/Dockerfile | 2 +- rpms/unrar/Dockerfile | 2 +- rpms/uv/Dockerfile | 2 +- rpms/vault/Dockerfile | 2 +- rpms/victoriametrics/Dockerfile | 2 +- rpms/vmutils/Dockerfile | 2 +- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c5f19cb..ffa7d59 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: build-8: runs-on: almalinux-8 container: - image: git.query.consul/unkin/almalinux8-actionsdind:latest + image: git.unkin.net/unkin/almalinux8-actionsdind:latest options: --privileged steps: @@ -33,7 +33,7 @@ jobs: build-9: runs-on: almalinux-8 container: - image: git.query.consul/unkin/almalinux9-actionsdind:latest + image: git.unkin.net/unkin/almalinux9-actionsdind:latest options: --privileged steps: diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 5fbd520..f322f0b 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -10,7 +10,7 @@ jobs: deploy-8: runs-on: almalinux-8 container: - image: git.query.consul/unkin/almalinux8-actionsdind:latest + image: git.unkin.net/unkin/almalinux8-actionsdind:latest options: --privileged steps: @@ -21,7 +21,7 @@ jobs: run: | mkdir -p /workspace/unkin/rpmbuilder/dist/8 export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1)) - curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8" + curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-8" unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/8 - name: Show RPMs @@ -33,13 +33,13 @@ jobs: DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }} run: | for rpm in $(find /workspace/unkin/rpmbuilder/dist/8 -type f -name "*.rpm"); do - curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el8/upload + curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el8/upload done deploy-9: runs-on: almalinux-8 container: - image: git.query.consul/unkin/almalinux9-actionsdind:latest + image: git.unkin.net/unkin/almalinux9-actionsdind:latest options: --privileged steps: @@ -50,7 +50,7 @@ jobs: run: | mkdir -p /workspace/unkin/rpmbuilder/dist/9 export PREVIOUS_RUN_ID=$((GITHUB_RUN_NUMBER - 1)) - curl -L -o /workspace/rpms.zip "https://git.query.consul/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9" + curl -L -o /workspace/rpms.zip "https://git.unkin.net/${GITHUB_REPOSITORY}/actions/runs/${PREVIOUS_RUN_ID}/artifacts/rpms-9" unzip /workspace/rpms.zip -d /workspace/unkin/rpmbuilder/dist/9 - name: Show RPMs @@ -62,5 +62,5 @@ jobs: DRONECI_PASSWORD: ${{ secrets.DRONECI_PASSWORD }} run: | for rpm in $(find /workspace/unkin/rpmbuilder/dist/9 -type f -name "*.rpm"); do - curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el9/upload + curl --user droneci:${{ secrets.DRONECI_PASSWORD }} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/almalinux/el9/upload done diff --git a/rpms/boilerplate/Dockerfile b/rpms/boilerplate/Dockerfile index 4dab95e..05d0e02 100644 --- a/rpms/boilerplate/Dockerfile +++ b/rpms/boilerplate/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/cni-plugins/Dockerfile b/rpms/cni-plugins/Dockerfile index db37ece..e9c7767 100644 --- a/rpms/cni-plugins/Dockerfile +++ b/rpms/cni-plugins/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/consul-cni/Dockerfile b/rpms/consul-cni/Dockerfile index 92da040..e544aac 100644 --- a/rpms/consul-cni/Dockerfile +++ b/rpms/consul-cni/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/consul/Dockerfile b/rpms/consul/Dockerfile index 8338fd9..f113c51 100644 --- a/rpms/consul/Dockerfile +++ b/rpms/consul/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/etcd/Dockerfile b/rpms/etcd/Dockerfile index ea9a576..b7b9da0 100644 --- a/rpms/etcd/Dockerfile +++ b/rpms/etcd/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/g10k/Dockerfile b/rpms/g10k/Dockerfile index 0921855..0e6f335 100644 --- a/rpms/g10k/Dockerfile +++ b/rpms/g10k/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/incus/Dockerfile b/rpms/incus/Dockerfile index de3f9d7..9d58b44 100644 --- a/rpms/incus/Dockerfile +++ b/rpms/incus/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/jellyfin-ffmpeg-bin/Dockerfile b/rpms/jellyfin-ffmpeg-bin/Dockerfile index dd20d9f..9bbe4cb 100644 --- a/rpms/jellyfin-ffmpeg-bin/Dockerfile +++ b/rpms/jellyfin-ffmpeg-bin/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 9 base image -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/jellyfin-server/Dockerfile b/rpms/jellyfin-server/Dockerfile index eb927c6..024924f 100644 --- a/rpms/jellyfin-server/Dockerfile +++ b/rpms/jellyfin-server/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 9 base image -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/jellyfin-web/Dockerfile b/rpms/jellyfin-web/Dockerfile index b568dd8..05326f4 100644 --- a/rpms/jellyfin-web/Dockerfile +++ b/rpms/jellyfin-web/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 9 base image -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/nfpm/Dockerfile b/rpms/nfpm/Dockerfile index 8fafb7b..965cb5e 100644 --- a/rpms/nfpm/Dockerfile +++ b/rpms/nfpm/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/node_exporter/Dockerfile b/rpms/node_exporter/Dockerfile index 4b2f2e7..585050c 100644 --- a/rpms/node_exporter/Dockerfile +++ b/rpms/node_exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/nomad-autoscaler/Dockerfile b/rpms/nomad-autoscaler/Dockerfile index 791e488..87c9476 100644 --- a/rpms/nomad-autoscaler/Dockerfile +++ b/rpms/nomad-autoscaler/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/nomad/Dockerfile b/rpms/nomad/Dockerfile index 7028421..6c5f3cc 100644 --- a/rpms/nomad/Dockerfile +++ b/rpms/nomad/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/nzbget/Dockerfile b/rpms/nzbget/Dockerfile index d866d6a..b7778b9 100644 --- a/rpms/nzbget/Dockerfile +++ b/rpms/nzbget/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/packer/Dockerfile b/rpms/packer/Dockerfile index 8a81557..fdbd242 100644 --- a/rpms/packer/Dockerfile +++ b/rpms/packer/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/puppet-initial/Dockerfile b/rpms/puppet-initial/Dockerfile index f9ea42b..c6b63db 100644 --- a/rpms/puppet-initial/Dockerfile +++ b/rpms/puppet-initial/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/ruff/Dockerfile b/rpms/ruff/Dockerfile index 65a8045..47a583a 100644 --- a/rpms/ruff/Dockerfile +++ b/rpms/ruff/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/terraform/Dockerfile b/rpms/terraform/Dockerfile index 94cff6d..3faefda 100644 --- a/rpms/terraform/Dockerfile +++ b/rpms/terraform/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/terragrunt/Dockerfile b/rpms/terragrunt/Dockerfile index ab0cf22..5476dcb 100644 --- a/rpms/terragrunt/Dockerfile +++ b/rpms/terragrunt/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/unkin-ca-certificates/Dockerfile b/rpms/unkin-ca-certificates/Dockerfile index d780271..ee5da82 100644 --- a/rpms/unkin-ca-certificates/Dockerfile +++ b/rpms/unkin-ca-certificates/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/unrar/Dockerfile b/rpms/unrar/Dockerfile index f31b9ee..bd350d0 100644 --- a/rpms/unrar/Dockerfile +++ b/rpms/unrar/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/uv/Dockerfile b/rpms/uv/Dockerfile index a02d01f..06f1078 100644 --- a/rpms/uv/Dockerfile +++ b/rpms/uv/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/vault/Dockerfile b/rpms/vault/Dockerfile index b4992ff..a61859f 100644 --- a/rpms/vault/Dockerfile +++ b/rpms/vault/Dockerfile @@ -1,5 +1,5 @@ # Start with the AlmaLinux 8.10 base image -FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux8-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/victoriametrics/Dockerfile b/rpms/victoriametrics/Dockerfile index 2456ada..bc58b69 100644 --- a/rpms/victoriametrics/Dockerfile +++ b/rpms/victoriametrics/Dockerfile @@ -1,4 +1,4 @@ -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist diff --git a/rpms/vmutils/Dockerfile b/rpms/vmutils/Dockerfile index 1faff7f..d2ef66c 100644 --- a/rpms/vmutils/Dockerfile +++ b/rpms/vmutils/Dockerfile @@ -1,4 +1,4 @@ -FROM git.query.consul/unkin/almalinux9-rpmbuilder:latest +FROM git.unkin.net/unkin/almalinux9-rpmbuilder:latest # Create output directory for RPMs RUN mkdir -p /app/dist