Skip to content

Commit 7f28ff8

Browse files
authored
docker: move from acr to ghcr (#436)
* docker: move from acr to ghcr * more fixes
1 parent 5497d05 commit 7f28ff8

File tree

9 files changed

+18
-24
lines changed

9 files changed

+18
-24
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FAABRIC_VERSION=0.20.0
2-
FAABRIC_CLI_IMAGE=faasm.azurecr.io/faabric:0.20.0
2+
FAABRIC_CLI_IMAGE=ghcr.io/faasm/faabric:0.20.0
33
COMPOSE_PROJECT_NAME=faabric-dev
44
CONAN_CACHE_MOUNT_SOURCE=./conan-cache/

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
- name: "Log in to ACR"
3030
uses: docker/login-action@v3
3131
with:
32-
registry: faasm.azurecr.io
33-
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
34-
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
32+
registry: ghcr.io
33+
username: faasm
34+
password: ${{ secrets.GHCR_PAT }}
3535
- name: "Build Faabric container"
3636
uses: docker/build-push-action@v5.2.0
3737
with:
3838
push: true
3939
file: docker/${{ matrix.image }}.dockerfile
4040
context: .
41-
tags: faasm.azurecr.io/${{ matrix.image }}:${{ env.TAG_VERSION }}
41+
tags: ghcr.io/faasm/${{ matrix.image }}:${{ env.TAG_VERSION }}
4242
build-args: FAABRIC_VERSION=${{ env.TAG_VERSION }}

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.event.pull_request.draft == false
2121
runs-on: ubuntu-latest
2222
container:
23-
image: faasm.azurecr.io/faabric:0.20.0
23+
image: ghcr.io/faasm/faabric:0.20.0
2424
env:
2525
DEPLOYMENT_TYPE: gha-ci
2626
steps:
@@ -34,7 +34,7 @@ jobs:
3434
if: github.event.pull_request.draft == false
3535
runs-on: ubuntu-latest
3636
container:
37-
image: faasm.azurecr.io/faabric:0.20.0
37+
image: ghcr.io/faasm/faabric:0.20.0
3838
steps:
3939
- name: "Check out code"
4040
uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
4545
if: github.event.pull_request.draft == false
4646
runs-on: ubuntu-latest
4747
container:
48-
image: faasm.azurecr.io/faabric:0.20.0
48+
image: ghcr.io/faasm/faabric:0.20.0
4949
steps:
5050
- name: "Check out code"
5151
uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
6565
REDIS_QUEUE_HOST: redis
6666
REDIS_STATE_HOST: redis
6767
container:
68-
image: faasm.azurecr.io/faabric:0.20.0
68+
image: ghcr.io/faasm/faabric:0.20.0
6969
options: --privileged
7070
services:
7171
redis:
@@ -104,7 +104,7 @@ jobs:
104104
REDIS_QUEUE_HOST: redis
105105
REDIS_STATE_HOST: redis
106106
container:
107-
image: faasm.azurecr.io/faabric:0.20.0
107+
image: ghcr.io/faasm/faabric:0.20.0
108108
options: --privileged
109109
services:
110110
redis:
@@ -156,7 +156,7 @@ jobs:
156156
REDIS_QUEUE_HOST: redis
157157
REDIS_STATE_HOST: redis
158158
container:
159-
image: faasm.azurecr.io/faabric:0.20.0
159+
image: ghcr.io/faasm/faabric:0.20.0
160160
services:
161161
redis:
162162
image: redis

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
image: redis
66

77
planner:
8-
image: faasm.azurecr.io/planner:${FAABRIC_VERSION}
8+
image: ghcr.io/faasm/planner:${FAABRIC_VERSION}
99
# The planner entrypoint supports changing the location of the
1010
# planner_server binary. If the binary is not found, it will wait until
1111
# it is built

docker/faabric.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM faasm.azurecr.io/faabric-base:0.15.0
1+
FROM ghcr.io/faasm/faabric-base:0.15.0
22
ARG FAABRIC_VERSION
33

44
# faabic-base image is not re-built often, so tag may be behind
@@ -30,7 +30,7 @@ RUN ./bin/create_venv.sh \
3030
RUN echo "set auto-load safe-path /" > /root/.gdbinit
3131

3232
# CLI setup
33-
ENV TERM xterm-256color
33+
ENV TERM=xterm-256color
3434

3535
RUN echo ". /code/faabric/bin/workon.sh" >> ~/.bashrc
3636
CMD ["/bin/bash", "-l"]

docker/openmpi-worker.dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

docker/planner.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM faasm.azurecr.io/faabric-base:0.15.0
1+
FROM ghcr.io/faasm/faabric-base:0.15.0
22
ARG FAABRIC_VERSION
33

44
# Flag to say we're in a container

tasks/docker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from invoke import task
22
from os.path import join
33
from subprocess import run
4-
from tasks.util.env import ACR_NAME, LLVM_VERSION, PROJ_ROOT, get_version
4+
from tasks.util.env import CR_NAME, LLVM_VERSION, PROJ_ROOT, get_version
55

66
FAABRIC_IMAGE_NAME = "faabric"
77
FAABRIC_BASE_IMAGE_NAME = "faabric-base"
@@ -10,7 +10,7 @@
1010

1111
def _get_docker_tag(img_name):
1212
ver = get_version()
13-
return "{}/{}:{}".format(ACR_NAME, img_name, ver)
13+
return "{}/{}:{}".format(CR_NAME, img_name, ver)
1414

1515

1616
def _do_container_build(name, nocache=False, push=False, build_args={}):

tasks/util/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FAABRIC_CONFIG_FILE = join(PROJ_ROOT, "faabric.ini")
1616

17-
ACR_NAME = "faasm.azurecr.io"
17+
CR_NAME = "ghcr.io/faasm"
1818

1919
# This LLVM version is for the LLVM that we use to compile regular C/C++ code
2020
# to x86. For the LLVM version to cross-compile code to WebAssembly see

0 commit comments

Comments
 (0)