Expand file tree Collapse file tree 6 files changed +13
-13
lines changed Original file line number Diff line number Diff line change 1
1
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
3
3
COMPOSE_PROJECT_NAME = cpp-dev
Original file line number Diff line number Diff line change @@ -26,15 +26,15 @@ jobs:
26
26
- name : " Log in to DockerHub"
27
27
uses : docker/login-action@v3
28
28
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 }}
32
32
- name : " Build and push cpp-sysroot container"
33
33
id : docker_build
34
34
uses : docker/build-push-action@v5.1.0
35
35
with :
36
36
push : true
37
37
file : docker/cpp-sysroot.dockerfile
38
38
context : .
39
- tags : faasm.azurecr.io /cpp-sysroot:${{ env.TAG_VERSION }}
39
+ tags : ghcr.io/faasm /cpp-sysroot:${{ env.TAG_VERSION }}
40
40
build-args : SYSROOT_VERSION=${{ env.TAG_VERSION }}
Original file line number Diff line number Diff line change 17
17
if : github.event.pull_request.draft == false
18
18
runs-on : ubuntu-latest
19
19
container :
20
- image : faasm.azurecr.io /cpp-sysroot:0.6.0
20
+ image : ghcr.io/faasm /cpp-sysroot:0.6.0
21
21
steps :
22
22
# --- Update code ---
23
23
- name : " Checkout code"
Original file line number Diff line number Diff line change 1
1
# 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
3
3
4
4
# 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
6
6
SHELL ["/bin/bash" , "-c" ]
7
7
ENV CPP_DOCKER="on"
8
8
@@ -64,7 +64,7 @@ RUN cd /code/cpp \
64
64
65
65
# CLI setup
66
66
WORKDIR /code/cpp
67
- ENV TERM xterm-256color
67
+ ENV TERM= xterm-256color
68
68
69
69
RUN echo ". /code/cpp/bin/workon.sh" >> ~/.bashrc
70
70
CMD ["/bin/bash" , "-l" ]
Original file line number Diff line number Diff line change 1
1
from subprocess import run
2
2
3
- ACR_NAME = "faasm.azurecr.io "
3
+ CR_NAME = "ghcr.io/faasm "
4
4
5
5
6
6
def build_container (
Original file line number Diff line number Diff line change 1
1
from faasmtools .docker import (
2
2
build_container ,
3
3
push_container ,
4
- ACR_NAME ,
4
+ CR_NAME ,
5
5
)
6
6
from faasmtools .env import (
7
7
LLVM_VERSION ,
11
11
from invoke import task
12
12
from os .path import join
13
13
14
- LLVM_IMAGE_NAME = "{}/llvm" .format (ACR_NAME )
14
+ LLVM_IMAGE_NAME = "{}/llvm" .format (CR_NAME )
15
15
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 )
17
17
SYSROOT_DOCKERFILE = join (PROJ_ROOT , "docker" , "cpp-sysroot.dockerfile" )
18
18
19
19
0 commit comments