Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SYSROOT_VERSION=0.6.0
SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.6.0
SYSROOT_CLI_IMAGE=ghcr.io/faasm/cpp-sysroot:0.6.0
COMPOSE_PROJECT_NAME=cpp-dev
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
- name: "Log in to DockerHub"
uses: docker/login-action@v3
with:
registry: faasm.azurecr.io
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
registry: ghcr.io
username: faasm
password: ${{ secrets.GHCR_PAT }}
- name: "Build and push cpp-sysroot container"
id: docker_build
uses: docker/build-push-action@v5.1.0
with:
push: true
file: docker/cpp-sysroot.dockerfile
context: .
tags: faasm.azurecr.io/cpp-sysroot:${{ env.TAG_VERSION }}
tags: ghcr.io/faasm/cpp-sysroot:${{ env.TAG_VERSION }}
build-args: SYSROOT_VERSION=${{ env.TAG_VERSION }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/cpp-sysroot:0.6.0
image: ghcr.io/faasm/cpp-sysroot:0.6.0
steps:
# --- Update code ---
- name: "Checkout code"
Expand Down
6 changes: 3 additions & 3 deletions docker/cpp-sysroot.dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# llvm image is not re-built often, so the tag may be behind
FROM faasm.azurecr.io/llvm:0.4.0 as llvm
FROM ghcr.io/faasm/llvm:0.4.0 AS llvm

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

Expand Down Expand Up @@ -64,7 +64,7 @@ RUN cd /code/cpp \

# CLI setup
WORKDIR /code/cpp
ENV TERM xterm-256color
ENV TERM=xterm-256color

RUN echo ". /code/cpp/bin/workon.sh" >> ~/.bashrc
CMD ["/bin/bash", "-l"]
2 changes: 1 addition & 1 deletion faasmtools/docker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from subprocess import run

ACR_NAME = "faasm.azurecr.io"
CR_NAME = "ghcr.io/faasm"


def build_container(
Expand Down
6 changes: 3 additions & 3 deletions tasks/docker.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from faasmtools.docker import (
build_container,
push_container,
ACR_NAME,
CR_NAME,
)
from faasmtools.env import (
LLVM_VERSION,
Expand All @@ -11,9 +11,9 @@
from invoke import task
from os.path import join

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


Expand Down