File tree Expand file tree Collapse file tree 6 files changed +13
-13
lines changed
Expand file tree Collapse file tree 6 files changed +13
-13
lines changed Original file line number Diff line number Diff line change 11SYSROOT_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
33COMPOSE_PROJECT_NAME = cpp-dev
Original file line number Diff line number Diff 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
34343535 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 }}
Original file line number Diff line number Diff line change 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"
Original file line number Diff line number Diff line change 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
66SHELL ["/bin/bash" , "-c" ]
77ENV CPP_DOCKER="on"
88
@@ -64,7 +64,7 @@ RUN cd /code/cpp \
6464
6565# CLI setup
6666WORKDIR /code/cpp
67- ENV TERM xterm-256color
67+ ENV TERM= xterm-256color
6868
6969RUN echo ". /code/cpp/bin/workon.sh" >> ~/.bashrc
7070CMD ["/bin/bash" , "-l" ]
Original file line number Diff line number Diff line change 11from subprocess import run
22
3- ACR_NAME = "faasm.azurecr.io "
3+ CR_NAME = "ghcr.io/faasm "
44
55
66def build_container (
Original file line number Diff line number Diff line change 11from faasmtools .docker import (
22 build_container ,
33 push_container ,
4- ACR_NAME ,
4+ CR_NAME ,
55)
66from faasmtools .env import (
77 LLVM_VERSION ,
1111from invoke import task
1212from os .path import join
1313
14- LLVM_IMAGE_NAME = "{}/llvm" .format (ACR_NAME )
14+ LLVM_IMAGE_NAME = "{}/llvm" .format (CR_NAME )
1515LLVM_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 )
1717SYSROOT_DOCKERFILE = join (PROJ_ROOT , "docker" , "cpp-sysroot.dockerfile" )
1818
1919
You can’t perform that action at this time.
0 commit comments