Skip to content

Commit 0a0e9a7

Browse files
authored
docker: move from acr to ghcr (#35)
1 parent b0e84ec commit 0a0e9a7

File tree

5 files changed

+12
-18
lines changed

5 files changed

+12
-18
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
- name: "Log in to DockerHub"
2525
uses: docker/login-action@v2
2626
with:
27-
registry: faasm.azurecr.io
28-
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
29-
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
27+
registry: ghcr.io
28+
username: faasm
29+
password: ${{ secrets.GHCR_PAT }}
3030
- name: "Build and push cpython container"
3131
id: docker_build
3232
uses: docker/build-push-action@v3
3333
with:
3434
push: true
3535
context: .
36-
tags: faasm.azurecr.io/cpython:${{ env.TAG_VERSION }}
36+
tags: ghcr.io/faasm/cpython:${{ env.TAG_VERSION }}
3737
build-args: FAASM_PYTHON_VERSION=${{ env.TAG_VERSION }}

.github/workflows/tests.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@ jobs:
2020
if: github.event.pull_request.draft == false
2121
runs-on: ubuntu-latest
2222
container:
23-
image: faasm.azurecr.io/cpython:0.4.0
24-
credentials:
25-
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
26-
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
23+
image: ghcr.io/faasm/cpython:0.4.0
2724
steps:
2825
- name: "Fetch code"
29-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
3027
with:
3128
submodules: true
3229
# We need to set the safe git directory as formatting relies on git-ls
@@ -44,16 +41,13 @@ jobs:
4441
REDIS_QUEUE_HOST: redis
4542
REDIS_STATE_HOST: redis
4643
container:
47-
image: faasm.azurecr.io/cpython:0.4.0
48-
credentials:
49-
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
50-
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
44+
image: ghcr.io/faasm/cpython:0.4.0
5145
services:
5246
redis:
5347
image: redis
5448
steps:
5549
- name: "Fetch code"
56-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5751
with:
5852
submodules: true
5953
- name: "Build Python function"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM faasm.azurecr.io/cpp-sysroot:0.4.0
1+
FROM ghcr.io/faasm/cpp-sysroot:0.4.0
22
ARG FAASM_PYTHON_VERSION
33

44
SHELL ["/bin/bash", "-c"]

tasks/docker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from faasmtools.docker import (
2-
ACR_NAME,
2+
CR_NAME,
33
build_container,
44
push_container,
55
)
@@ -10,7 +10,7 @@
1010
get_version,
1111
)
1212

13-
CONTAINER_IMAGE = "{}/cpython".format(ACR_NAME)
13+
CONTAINER_IMAGE = "{}/cpython".format(CR_NAME)
1414
DOCKERFILE = join(PROJ_ROOT, "Dockerfile")
1515

1616

0 commit comments

Comments
 (0)