Merge pull request #24 from Greelan/reposwitch

Greelan · web-flow · commit d6a2880b420e · 2025-09-01T17:19:33.000+10:00
feat: switch to DockerHub
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -30,23 +30,32 @@ jobs:
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
+
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - uses: docker/build-push-action@v6
         with:
           context: .
           file: ./base/${{ matrix.base }}/Dockerfile
           platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: |
-            ghcr.io/cubecoders/amp:${{ matrix.base }}
+            cubecoders/ampbase:${{ matrix.base }}
           cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.base }}
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.base }}
           provenance: mode=max
           sbom: true
+      
+      - uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: cubecoders/ampbase
+          short-description: "Images for AMP's Docker instances."
+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -57,9 +57,8 @@ jobs:
 
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: docker/build-push-action@v6
         with:
@@ -68,7 +67,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:java-${{ matrix.java }}
+          tags: cubecoders/ampbase:java-${{ matrix.java }}
           cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.java }}
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.java }}
           provenance: mode=max
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
@@ -57,9 +57,8 @@ jobs:
 
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: docker/build-push-action@v6
         with:
@@ -68,7 +67,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:mono-${{ matrix.mono }}
+          tags: cubecoders/ampbase:mono-${{ matrix.mono }}
           cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.mono }}
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.mono }}
           provenance: mode=max
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -63,9 +63,8 @@ jobs:
 
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: docker/build-push-action@v6
         with:
@@ -74,7 +73,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:python-${{ matrix.python }}
+          tags: cubecoders/ampbase:python-${{ matrix.python }}
           cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.python }}
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.python }}
           provenance: mode=max
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -56,9 +56,8 @@ jobs:
 
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: docker/build-push-action@v6
         with:
@@ -67,7 +66,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:wine-common
+          tags: cubecoders/ampbase:wine-common
           cache-from: type=gha,scope=${{ github.workflow }}-common
           cache-to: type=gha,mode=max,scope=${{ github.workflow }}-common
           provenance: mode=max
@@ -94,9 +93,8 @@ jobs:
 
       - uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: cubecoders
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: docker/build-push-action@v6
         with:
@@ -105,7 +103,7 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           push: true
           pull: true
-          tags: ghcr.io/cubecoders/amp:wine-${{ matrix.version }}
+          tags: cubecoders/ampbase:wine-${{ matrix.version }}
           cache-from: |
             type=gha,scope=${{ github.workflow }}-wine-common
             type=gha,scope=${{ github.workflow }}-wine-${{ matrix.version }}
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
 # dockerfiles
-Docker images for AMP, used for automated builds by DockerHub.
+Docker images for AMP, used for automated builds by DockerHub.
diff --git a/base/debian-13/Dockerfile b/base/debian-13/Dockerfile
@@ -1,5 +1,5 @@
 # Base Debian 13 image for AMP containers
-# ghcr.io/cubecoders/amp:debian-13
+# cubecoders/ampbase:debian-13
 
 FROM        debian:trixie-slim
 
diff --git a/base/debian/Dockerfile b/base/debian/Dockerfile
@@ -1,5 +1,5 @@
 # Base Debian 12 image for AMP containers
-# ghcr.io/cubecoders/amp:debian
+# cubecoders/ampbase:debian
 
 FROM        debian:bookworm-slim
 
diff --git a/base/ubuntu/Dockerfile b/base/ubuntu/Dockerfile
@@ -1,5 +1,5 @@
 # Base Ubuntu 24.04 image for AMP containers
-# ghcr.io/cubecoders/amp:ubuntu
+# cubecoders/ampbase:ubuntu
 
 FROM        ubuntu:noble
 
diff --git a/java/lts/Dockerfile b/java/lts/Dockerfile
@@ -1,7 +1,7 @@
 # Java image for AMP containers including all Temurin LTS versions
-# ghcr.io/cubecoders/amp:java-lts
+# cubecoders/ampbase:java-lts
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/mono/latest/Dockerfile b/mono/latest/Dockerfile
@@ -1,7 +1,7 @@
 # Mono image for AMP containers
-# ghcr.io/cubecoders/amp:mono-latest
+# cubecoders/ampbase:mono-latest
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile
@@ -1,5 +1,5 @@
 # Python image for AMP containers using Python 3.10 from upstream
-# ghcr.io/cubecoders/amp:python-3.10
+# cubecoders/ampbase:python-3.10
 
 FROM        python:3.10-slim-bookworm AS py310
 
@@ -13,7 +13,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
diff --git a/python/3.11/Dockerfile b/python/3.11/Dockerfile
@@ -1,5 +1,5 @@
 # Python image for AMP containers using Python 3.11 from upstream
-# ghcr.io/cubecoders/amp:python-3.11
+# cubecoders/ampbase:python-3.11
 
 FROM        python:3.11-slim-bookworm AS py311
 
@@ -13,7 +13,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
diff --git a/python/3.12/Dockerfile b/python/3.12/Dockerfile
@@ -1,5 +1,5 @@
 # Python image for AMP containers using Python 3.12 from upstream
-# ghcr.io/cubecoders/amp:python-3.12
+# cubecoders/ampbase:python-3.12
 
 FROM        python:3.12-slim-bookworm AS py312
 
@@ -13,7 +13,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
diff --git a/python/3.13/Dockerfile b/python/3.13/Dockerfile
@@ -1,5 +1,5 @@
 # Python image for AMP containers using Python 3.13 from upstream
-# ghcr.io/cubecoders/amp:python-3.13
+# cubecoders/ampbase:python-3.13
 
 FROM        python:3.13-slim-bookworm AS py313
 
@@ -13,7 +13,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
diff --git a/python/3/Dockerfile b/python/3/Dockerfile
@@ -1,5 +1,5 @@
 # Python image for AMP containers including Python 3.10, 3.11 (default), 3.12 and 3.13 from upstream
-# ghcr.io/cubecoders/amp:python-3
+# cubecoders/ampbase:python-3
 
 FROM        python:3.10-slim-bookworm AS py310
 
@@ -49,7 +49,7 @@ RUN         chmod +x /usr/local/bin/find-deps.sh
 RUN         set -eux; \
             /usr/local/bin/find-deps.sh >/tmp/${PYTHON_VERSION}-run-deps.txt
    
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         PIP_DISABLE_PIP_VERSION_CHECK="1"
diff --git a/wine/10-stable/Dockerfile b/wine/10-stable/Dockerfile
@@ -1,7 +1,7 @@
 # Wine image for AMP containers based on Wine 10 stable
-# ghcr.io/cubecoders/amp:wine-10-stable
+# cubecoders/ampbase:wine-10-stable
 
-FROM        ghcr.io/cubecoders/amp:wine-common
+FROM        cubecoders/ampbase:wine-common
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/wine/9-stable/Dockerfile b/wine/9-stable/Dockerfile
@@ -1,7 +1,7 @@
 # Wine image for AMP containers based on Wine 9 stable
-# ghcr.io/cubecoders/amp:wine-9-stable
+# cubecoders/ampbase:wine-9-stable
 
-FROM        ghcr.io/cubecoders/amp:wine-common
+FROM        cubecoders/ampbase:wine-common
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/wine/common/Dockerfile b/wine/common/Dockerfile
@@ -1,5 +1,5 @@
 # Wine common dependencies image for AMP containers
-# ghcr.io/cubecoders/amp:wine-common
+# cubecoders/ampbase:wine-common
 
 ARG         DEPSFINDER_PLATFORM=linux/amd64
 FROM        --platform=${DEPSFINDER_PLATFORM} debian:bookworm-slim AS depsfinder
@@ -57,7 +57,7 @@ RUN         set -eux; \
                 done; \
             fi
 
-FROM        ghcr.io/cubecoders/amp:debian
+FROM        cubecoders/ampbase:debian
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile
@@ -1,7 +1,7 @@
 # Wine image for AMP containers based on Wine devel
-# ghcr.io/cubecoders/amp:wine-devel
+# cubecoders/ampbase:wine-devel
 
-FROM        ghcr.io/cubecoders/amp:wine-common
+FROM        cubecoders/ampbase:wine-common
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/wine/stable/Dockerfile b/wine/stable/Dockerfile
@@ -1,7 +1,7 @@
 # Wine image for AMP containers based on Wine stable
-# ghcr.io/cubecoders/amp:wine-stable
+# cubecoders/ampbase:wine-stable
 
-FROM        ghcr.io/cubecoders/amp:wine-common
+FROM        cubecoders/ampbase:wine-common
 
 LABEL       org.opencontainers.image.licenses=MIT
 
diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile
@@ -1,7 +1,7 @@
 # Wine image for AMP containers based on Wine staging
-# ghcr.io/cubecoders/amp:wine-staging
+# cubecoders/ampbase:wine-staging
 
-FROM        ghcr.io/cubecoders/amp:wine-common
+FROM        cubecoders/ampbase:wine-common
 
 LABEL       org.opencontainers.image.licenses=MIT
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# dockerfiles`
`2`		`-Docker images for AMP, used for automated builds by DockerHub.`
	`2`	`+Docker images for AMP, used for automated builds by DockerHub.`