Skip to content

Commit 258c560

Browse files
authoredApr 22, 2025
faasmtools: move from acr to ghcr (#133)
1 parent a1c54c1 commit 258c560

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed
 

‎.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
SYSROOT_VERSION=0.6.0
2-
SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.6.0
2+
SYSROOT_CLI_IMAGE=ghcr.io/faasm/cpp-sysroot:0.6.0
33
COMPOSE_PROJECT_NAME=cpp-dev

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
- name: "Log in to DockerHub"
2727
uses: docker/login-action@v3
2828
with:
29-
registry: faasm.azurecr.io
30-
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
31-
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
29+
registry: ghcr.io
30+
username: faasm
31+
password: ${{ secrets.GHCR_PAT }}
3232
- name: "Build and push cpp-sysroot container"
3333
id: docker_build
3434
uses: docker/build-push-action@v5.1.0
3535
with:
3636
push: true
3737
file: docker/cpp-sysroot.dockerfile
3838
context: .
39-
tags: faasm.azurecr.io/cpp-sysroot:${{ env.TAG_VERSION }}
39+
tags: ghcr.io/faasm/cpp-sysroot:${{ env.TAG_VERSION }}
4040
build-args: SYSROOT_VERSION=${{ env.TAG_VERSION }}

‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.event.pull_request.draft == false
1818
runs-on: ubuntu-latest
1919
container:
20-
image: faasm.azurecr.io/cpp-sysroot:0.6.0
20+
image: ghcr.io/faasm/cpp-sysroot:0.6.0
2121
steps:
2222
# --- Update code ---
2323
- name: "Checkout code"

‎docker/cpp-sysroot.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# llvm image is not re-built often, so the tag may be behind
2-
FROM faasm.azurecr.io/llvm:0.4.0 as llvm
2+
FROM ghcr.io/faasm/llvm:0.4.0 AS llvm
33

44
# faabric-base image is not re-built often, so tag may be behind
5-
FROM faasm.azurecr.io/faabric-base:0.15.0
5+
FROM ghcr.io/faasm/faabric-base:0.15.0
66
SHELL ["/bin/bash", "-c"]
77
ENV CPP_DOCKER="on"
88

@@ -64,7 +64,7 @@ RUN cd /code/cpp \
6464

6565
# CLI setup
6666
WORKDIR /code/cpp
67-
ENV TERM xterm-256color
67+
ENV TERM=xterm-256color
6868

6969
RUN echo ". /code/cpp/bin/workon.sh" >> ~/.bashrc
7070
CMD ["/bin/bash", "-l"]

‎faasmtools/docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from subprocess import run
22

3-
ACR_NAME = "faasm.azurecr.io"
3+
CR_NAME = "ghcr.io/faasm"
44

55

66
def build_container(

‎tasks/docker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from faasmtools.docker import (
22
build_container,
33
push_container,
4-
ACR_NAME,
4+
CR_NAME,
55
)
66
from faasmtools.env import (
77
LLVM_VERSION,
@@ -11,9 +11,9 @@
1111
from invoke import task
1212
from os.path import join
1313

14-
LLVM_IMAGE_NAME = "{}/llvm".format(ACR_NAME)
14+
LLVM_IMAGE_NAME = "{}/llvm".format(CR_NAME)
1515
LLVM_DOCKERFILE = join(PROJ_ROOT, "docker", "llvm.dockerfile")
16-
SYSROOT_IMAGE_NAME = "{}/cpp-sysroot".format(ACR_NAME)
16+
SYSROOT_IMAGE_NAME = "{}/cpp-sysroot".format(CR_NAME)
1717
SYSROOT_DOCKERFILE = join(PROJ_ROOT, "docker", "cpp-sysroot.dockerfile")
1818

1919

0 commit comments

Comments
 (0)
Failed to load comments.