Skip to content

Commit a9f9b52

Browse files
alexalex
authored
Move to GHCR (#321)
1 parent e621113 commit a9f9b52

File tree

2 files changed

+29
-34
lines changed

2 files changed

+29
-34
lines changed

‎.github/workflows/build-docker-images.yml

+27-27
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ jobs:
2525
strategy:
2626
matrix:
2727
IMAGE:
28-
- {TAG_NAME: "pyca/cryptography-runner-centos8", DOCKERFILE_PATH: "runners/centos8"}
29-
- {TAG_NAME: "pyca/cryptography-runner-centos8-fips", DOCKERFILE_PATH: "runners/centos8", BUILD_ARGS: "--build-arg FIPS=1"}
28+
- {TAG_NAME: "cryptography-runner-centos8", DOCKERFILE_PATH: "runners/centos8"}
29+
- {TAG_NAME: "cryptography-runner-centos8-fips", DOCKERFILE_PATH: "runners/centos8", BUILD_ARGS: "--build-arg FIPS=1"}
3030

31-
- {TAG_NAME: "pyca/cryptography-runner-fedora", DOCKERFILE_PATH: "runners/fedora"}
32-
- {TAG_NAME: "pyca/cryptography-runner-alpine", DOCKERFILE_PATH: "runners/alpine"}
31+
- {TAG_NAME: "cryptography-runner-fedora", DOCKERFILE_PATH: "runners/fedora"}
32+
- {TAG_NAME: "cryptography-runner-alpine", DOCKERFILE_PATH: "runners/alpine"}
3333

34-
- {TAG_NAME: "pyca/cryptography-runner-stretch", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=stretch"}
35-
- {TAG_NAME: "pyca/cryptography-runner-buster", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=buster"}
36-
- {TAG_NAME: "pyca/cryptography-runner-bullseye", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=bullseye"}
37-
- {TAG_NAME: "pyca/cryptography-runner-sid", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=sid"}
34+
- {TAG_NAME: "cryptography-runner-stretch", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=stretch"}
35+
- {TAG_NAME: "cryptography-runner-buster", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=buster"}
36+
- {TAG_NAME: "cryptography-runner-bullseye", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=bullseye"}
37+
- {TAG_NAME: "cryptography-runner-sid", DOCKERFILE_PATH: "runners/debian", BUILD_ARGS: "--build-arg RELEASE=sid"}
3838

39-
- {TAG_NAME: "pyca/cryptography-runner-ubuntu-bionic", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=bionic"}
40-
- {TAG_NAME: "pyca/cryptography-runner-ubuntu-focal", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=focal"}
41-
- {TAG_NAME: "pyca/cryptography-runner-ubuntu-rolling", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=rolling"}
39+
- {TAG_NAME: "cryptography-runner-ubuntu-bionic", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=bionic"}
40+
- {TAG_NAME: "cryptography-runner-ubuntu-focal", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=focal"}
41+
- {TAG_NAME: "cryptography-runner-ubuntu-rolling", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=rolling"}
4242

43-
- {TAG_NAME: "pyca/cryptography-manylinux1:x86_64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux1"}
44-
- {TAG_NAME: "pyca/cryptography-manylinux2010:x86_64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux2010"}
43+
- {TAG_NAME: "cryptography-manylinux1:x86_64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux1"}
44+
- {TAG_NAME: "cryptography-manylinux2010:x86_64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux2010"}
4545

4646
name: "Building docker image ${{ matrix.IMAGE.TAG_NAME }}"
4747
steps:
@@ -50,18 +50,18 @@ jobs:
5050
# Sometimes we add new docker images and if they've never been pushed
5151
# they can't be pulled.
5252
- name: Pull existing image
53-
run: docker pull ${{ matrix.IMAGE.TAG_NAME }} || true
53+
run: docker pull ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }} || true
5454
if: github.event_name != 'schedule'
5555
- name: Build image
56-
run: docker build --pull --cache-from ${{ matrix.IMAGE.TAG_NAME }} -t ${{ matrix.IMAGE.TAG_NAME }} ${{ matrix.IMAGE.DOCKERFILE_PATH }} ${{ matrix.IMAGE.BUILD_ARGS }}
56+
run: docker build --pull --cache-from ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }} -t ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }} ${{ matrix.IMAGE.DOCKERFILE_PATH }} ${{ matrix.IMAGE.BUILD_ARGS }}
5757
- name: Login to docker
58-
run: 'docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"'
58+
run: 'docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" ghcr.io'
5959
env:
60-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
61-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
60+
DOCKER_USERNAME: ${{ secrets.GHCR_TOKEN_USER }}
61+
DOCKER_PASSWORD: ${{ secrets.GHCR_TOKEN }}
6262
if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
6363
- name: Push image
64-
run: docker push ${{ matrix.IMAGE.TAG_NAME }}
64+
run: docker push ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }}
6565
if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
6666

6767
# Build the manylinux2014_aarch64 container
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
matrix:
7272
IMAGE:
73-
- {TAG_NAME: "pyca/cryptography-manylinux2014_aarch64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux2014_aarch64"}
73+
- {TAG_NAME: "cryptography-manylinux2014_aarch64", DOCKERFILE_PATH: "cryptography-manylinux", BUILD_ARGS: "-f cryptography-manylinux/Dockerfile-manylinux2014_aarch64"}
7474

7575
name: "Building docker image ${{ matrix.IMAGE.TAG_NAME }}"
7676
steps:
@@ -86,22 +86,22 @@ jobs:
8686
# Sometimes we add new docker images and if they've never been pushed
8787
# they can't be pulled.
8888
- name: Pull existing image
89-
run: docker pull ${{ matrix.IMAGE.TAG_NAME }}:latest || true
89+
run: docker pull ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }}:latest || true
9090
if: github.event_name != 'schedule'
9191
- name: Build image
9292
run: >
93-
docker buildx build --platform linux/arm64 --pull --cache-from ${{ matrix.IMAGE.TAG_NAME }}
93+
docker buildx build --platform linux/arm64 --pull --cache-from ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }}
9494
--cache-to "type=local,dest=/tmp/.buildx-cache" --output "type=image,push=false"
95-
-t ${{ matrix.IMAGE.TAG_NAME }} ${{ matrix.IMAGE.DOCKERFILE_PATH }} ${{ matrix.IMAGE.BUILD_ARGS }}
95+
-t ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }} ${{ matrix.IMAGE.DOCKERFILE_PATH }} ${{ matrix.IMAGE.BUILD_ARGS }}
9696
- name: Login to docker
97-
run: 'docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"'
97+
run: 'docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" ghcr.io'
9898
env:
99-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
100-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
99+
DOCKER_USERNAME: ${{ secrets.GHCR_TOKEN_USER }}
100+
DOCKER_PASSWORD: ${{ secrets.GHCR_TOKEN }}
101101
if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'
102102
- name: Push image
103103
run: >
104104
docker buildx build --cache-from "type=local,src=/tmp/.buildx-cache"
105-
--platform linux/arm64 --output "type=image,push=true" -t ${{ matrix.IMAGE.TAG_NAME }}
105+
--platform linux/arm64 --output "type=image,push=true" -t ghcr.io/pyca/${{ matrix.IMAGE.TAG_NAME }}
106106
${{ matrix.IMAGE.DOCKERFILE_PATH }} ${{ matrix.IMAGE.BUILD_ARGS }}
107107
if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/master'

‎README.md

+2-7
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@ as well as OpenSSL binaries we use.
88
## Docker Containers
99

1010
Docker containers are built on merge by Github Actions and then uploaded to
11-
[Docker Hub](https://hub.docker.com/u/pyca/). Each repository on Docker Hub
12-
corresponds to a directory in `runners`.
13-
14-
### New Images
15-
16-
When making a new image create a repository on Docker Hub, select permissions,
17-
and add the "robots" group as Read & Write capable.
11+
Github Container Registry. Each repository corresponds to a directory in
12+
`runners`.

0 commit comments

Comments
 (0)