Skip to content

Commit f7f6f06

Browse files
GreelanGreelan
committed
feat: switch to dockerhub, update overview and description
1 parent afcdccb commit f7f6f06

File tree

22 files changed

+82
-55
lines changed

22 files changed

+82
-55
lines changed

‎.github/workflows/base.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,32 @@ jobs:
3030
- uses: actions/checkout@v4
3131
- uses: docker/setup-qemu-action@v3
3232
- uses: docker/setup-buildx-action@v3
33+
3334
- uses: docker/login-action@v3
3435
with:
35-
registry: ghcr.io
36-
username: cubecoders
37-
password: ${{ secrets.GITHUB_TOKEN }}
36+
username: ${{ vars.DOCKERHUB_USERNAME }}
37+
password: ${{ secrets.DOCKERHUB_TOKEN }}
38+
3839
- uses: docker/build-push-action@v6
3940
with:
4041
context: .
4142
file: ./base/${{ matrix.base }}/Dockerfile
4243
platforms: linux/amd64,linux/arm64/v8
4344
push: true
4445
tags: |
45-
ghcr.io/cubecoders/amp:${{ matrix.base }}
46+
cubecoders/amp:${{ matrix.base }}
4647
cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.base }}
4748
cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.base }}
4849
provenance: mode=max
4950
sbom: true
51+
52+
- uses: peter-evans/dockerhub-description@v4
53+
with:
54+
username: ${{ vars.DOCKERHUB_USERNAME }}
55+
password: ${{ secrets.DOCKERHUB_TOKEN }}
56+
repository: cubecoders/amp
57+
short-description: "Images for AMP's Docker instances."
58+
5059

5160
concurrency:
5261
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/java.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ jobs:
5757

5858
- uses: docker/login-action@v3
5959
with:
60-
registry: ghcr.io
61-
username: cubecoders
62-
password: ${{ secrets.GITHUB_TOKEN }}
60+
username: ${{ vars.DOCKERHUB_USERNAME }}
61+
password: ${{ secrets.DOCKERHUB_TOKEN }}
6362

6463
- uses: docker/build-push-action@v6
6564
with:
@@ -68,7 +67,7 @@ jobs:
6867
platforms: linux/amd64,linux/arm64/v8
6968
push: true
7069
pull: true
71-
tags: ghcr.io/cubecoders/amp:java-${{ matrix.java }}
70+
tags: cubecoders/amp:java-${{ matrix.java }}
7271
cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.java }}
7372
cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.java }}
7473
provenance: mode=max

‎.github/workflows/mono.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ jobs:
5757

5858
- uses: docker/login-action@v3
5959
with:
60-
registry: ghcr.io
61-
username: cubecoders
62-
password: ${{ secrets.GITHUB_TOKEN }}
60+
username: ${{ vars.DOCKERHUB_USERNAME }}
61+
password: ${{ secrets.DOCKERHUB_TOKEN }}
6362

6463
- uses: docker/build-push-action@v6
6564
with:
@@ -68,7 +67,7 @@ jobs:
6867
platforms: linux/amd64,linux/arm64/v8
6968
push: true
7069
pull: true
71-
tags: ghcr.io/cubecoders/amp:mono-${{ matrix.mono }}
70+
tags: cubecoders/amp:mono-${{ matrix.mono }}
7271
cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.mono }}
7372
cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.mono }}
7473
provenance: mode=max

‎.github/workflows/python.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ jobs:
6363

6464
- uses: docker/login-action@v3
6565
with:
66-
registry: ghcr.io
67-
username: cubecoders
68-
password: ${{ secrets.GITHUB_TOKEN }}
66+
username: ${{ vars.DOCKERHUB_USERNAME }}
67+
password: ${{ secrets.DOCKERHUB_TOKEN }}
6968

7069
- uses: docker/build-push-action@v6
7170
with:
@@ -74,7 +73,7 @@ jobs:
7473
platforms: linux/amd64,linux/arm64/v8
7574
push: true
7675
pull: true
77-
tags: ghcr.io/cubecoders/amp:python-${{ matrix.python }}
76+
tags: cubecoders/amp:python-${{ matrix.python }}
7877
cache-from: type=gha,scope=${{ github.workflow }}-${{ matrix.python }}
7978
cache-to: type=gha,mode=max,scope=${{ github.workflow }}-${{ matrix.python }}
8079
provenance: mode=max

‎.github/workflows/wine.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ jobs:
5656

5757
- uses: docker/login-action@v3
5858
with:
59-
registry: ghcr.io
60-
username: cubecoders
61-
password: ${{ secrets.GITHUB_TOKEN }}
59+
username: ${{ vars.DOCKERHUB_USERNAME }}
60+
password: ${{ secrets.DOCKERHUB_TOKEN }}
6261

6362
- uses: docker/build-push-action@v6
6463
with:
@@ -67,7 +66,7 @@ jobs:
6766
platforms: linux/amd64,linux/arm64/v8
6867
push: true
6968
pull: true
70-
tags: ghcr.io/cubecoders/amp:wine-common
69+
tags: cubecoders/amp:wine-common
7170
cache-from: type=gha,scope=${{ github.workflow }}-common
7271
cache-to: type=gha,mode=max,scope=${{ github.workflow }}-common
7372
provenance: mode=max
@@ -94,9 +93,8 @@ jobs:
9493

9594
- uses: docker/login-action@v3
9695
with:
97-
registry: ghcr.io
98-
username: cubecoders
99-
password: ${{ secrets.GITHUB_TOKEN }}
96+
username: ${{ vars.DOCKERHUB_USERNAME }}
97+
password: ${{ secrets.DOCKERHUB_TOKEN }}
10098

10199
- uses: docker/build-push-action@v6
102100
with:
@@ -105,7 +103,7 @@ jobs:
105103
platforms: linux/amd64,linux/arm64/v8
106104
push: true
107105
pull: true
108-
tags: ghcr.io/cubecoders/amp:wine-${{ matrix.version }}
106+
tags: cubecoders/amp:wine-${{ matrix.version }}
109107
cache-from: |
110108
type=gha,scope=${{ github.workflow }}-wine-common
111109
type=gha,scope=${{ github.workflow }}-wine-${{ matrix.version }}

‎README.md‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,25 @@
1-
# dockerfiles
2-
Docker images for AMP, used for automated builds by DockerHub.
1+
# AMP Docker Images
2+
3+
This repository contains images for use with AMP by CubeCoders. These images are updated at least weekly.
4+
5+
These images are not designed to be run directly. Instead, they should be run via the AMP Instance Manager.
6+
7+
Currently maintained image tags:
8+
9+
- [debian](https://github.com/CubeCoders/dockerfiles/tree/master/base/debian): the primary AMP base image, used for most AMP instances, based on Debian 12
10+
- [debian-13](https://github.com/CubeCoders/dockerfiles/tree/master/base/debian-13): an alternate AMP base image, based on Debian 13
11+
- [ubuntu](https://github.com/CubeCoders/dockerfiles/tree/master/base/ubuntu): an alternate AMP base image, based on Ubuntu 24.04
12+
- [java-lts](https://github.com/CubeCoders/dockerfiles/tree/master/base/java-lts): an image based on the `debian` image, incorporating Adoptium Eclipse Temurin Java 8, 11, 17 and 21 LTS builds from https://adoptium.net
13+
- [python-3](https://github.com/CubeCoders/dockerfiles/tree/master/base/python-3): an image based on the `debian` image, incorporating official builds for Python 3.10, 3.11 (default), 3.12 and 3.13
14+
- [python-3.10](https://github.com/CubeCoders/dockerfiles/tree/master/base/python-3.10): an image based on the `debian` image, incorporating the official build for Python 3.10
15+
- [python-3.11](https://github.com/CubeCoders/dockerfiles/tree/master/base/python-3.11): an image based on the `debian` image, incorporating the official build for Python 3.11
16+
- [python-3.12](https://github.com/CubeCoders/dockerfiles/tree/master/base/python-3.12): an image based on the `debian` image, incorporating the official build for Python 3.12
17+
- [python-3.13](https://github.com/CubeCoders/dockerfiles/tree/master/base/python-3.13): an image based on the `debian` image, incorporating the official build for Python 3.13
18+
- [mono-latest](https://github.com/CubeCoders/dockerfiles/tree/master/base/mono-latest): an image based on the `debian` image, incorporating the latest official build for Mono from https://mono-project.com
19+
- [wine-stable](https://github.com/CubeCoders/dockerfiles/tree/master/base/wine-stable): an image based on the `debian` image, incorporating the latest Wine stable build from https://winehq.org
20+
- [wine-devel](https://github.com/CubeCoders/dockerfiles/tree/master/base/wine-devel): an image based on the `debian` image, incorporating the latest Wine devel build from https://winehq.org
21+
- [wine-staging](https://github.com/CubeCoders/dockerfiles/tree/master/base/wine-staging): an image based on the `debian` image, incorporating the latest Wine staging build from https://winehq.org
22+
- [wine-10-stable](https://github.com/CubeCoders/dockerfiles/tree/master/base/wine-10-stable): an image based on the `debian` image, incorporating the latest Wine 10 stable build from https://winehq.org
23+
- [wine-9-stable](https://github.com/CubeCoders/dockerfiles/tree/master/base/wine-9-stable): an image based on the `debian` image, incorporating the latest Wine 9 stable build from https://winehq.org
24+
25+
All images are built for `linux/amd64` and `linux/arm64`. The `linux/arm64` builds include [box86](https://github.com/Pi-Apps-Coders/box86-debs) and [box64](https://github.com/Pi-Apps-Coders/box64-debs).

‎base/debian-13/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base Debian 13 image for AMP containers
2-
# ghcr.io/cubecoders/amp:debian-13
2+
# cubecoders/amp:debian-13
33

44
FROM debian:trixie-slim
55

‎base/debian/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base Debian 12 image for AMP containers
2-
# ghcr.io/cubecoders/amp:debian
2+
# cubecoders/amp:debian
33

44
FROM debian:bookworm-slim
55

‎base/ubuntu/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base Ubuntu 24.04 image for AMP containers
2-
# ghcr.io/cubecoders/amp:ubuntu
2+
# cubecoders/amp:ubuntu
33

44
FROM ubuntu:noble
55

‎java/lts/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Java image for AMP containers including all Temurin LTS versions
2-
# ghcr.io/cubecoders/amp:java-lts
2+
# cubecoders/amp:java-lts
33

4-
FROM ghcr.io/cubecoders/amp:debian
4+
FROM cubecoders/amp:debian
55

66
LABEL org.opencontainers.image.licenses=MIT
77

0 commit comments

Comments
 (0)