Skip to content

docker: move from acr to ghcr #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

docker: move from acr to ghcr #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
- name: "Log in to DockerHub"
uses: docker/login-action@v2
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 cpython container"
id: docker_build
uses: docker/build-push-action@v3
with:
push: true
context: .
tags: faasm.azurecr.io/cpython:${{ env.TAG_VERSION }}
tags: ghcr.io/faasm/cpython:${{ env.TAG_VERSION }}
build-args: FAASM_PYTHON_VERSION=${{ env.TAG_VERSION }}
14 changes: 4 additions & 10 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: faasm.azurecr.io/cpython:0.4.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
image: ghcr.io/faasm/cpython:0.4.0
steps:
- name: "Fetch code"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
# We need to set the safe git directory as formatting relies on git-ls
Expand All @@ -44,16 +41,13 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: faasm.azurecr.io/cpython:0.4.0
credentials:
username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
image: ghcr.io/faasm/cpython:0.4.0
services:
redis:
image: redis
steps:
- name: "Fetch code"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: "Build Python function"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM faasm.azurecr.io/cpp-sysroot:0.4.0
FROM ghcr.io/faasm/cpp-sysroot:0.4.0
ARG FAASM_PYTHON_VERSION

SHELL ["/bin/bash", "-c"]
Expand Down
4 changes: 2 additions & 2 deletions tasks/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from faasmtools.docker import (
ACR_NAME,
CR_NAME,
build_container,
push_container,
)
Expand All @@ -10,7 +10,7 @@
get_version,
)

CONTAINER_IMAGE = "{}/cpython".format(ACR_NAME)
CONTAINER_IMAGE = "{}/cpython".format(CR_NAME)
DOCKERFILE = join(PROJ_ROOT, "Dockerfile")


Expand Down
2 changes: 1 addition & 1 deletion third-party/cpp
Open in desktop
Submodule cpp updated 25 files
+2 −2 .env
+4 −4 .github/workflows/release.yml
+1 −4 .github/workflows/tests.yml
+2 −4 .gitignore
+1 −1 VERSION
+3 −3 docker/cpp-sysroot.dockerfile
+5 −1 faasmtools/build.py
+1 −1 faasmtools/docker.py
+1 −0 func/CMakeLists.txt
+3 −3 func/demo/calloc.cpp
+15 −6 func/demo/chain_output.cpp
+60 −13 func/omp/repeated_reduce.cpp
+16 −0 func/s3/CMakeLists.txt
+30 −0 func/s3/add_key_bytes.cpp
+29 −0 func/s3/get_key_bytes.cpp
+20 −0 func/s3/get_num_buckets.cpp
+25 −0 func/s3/get_num_keys.cpp
+42 −0 func/s3/list_buckets.cpp
+47 −0 func/s3/list_keys.cpp
+2 −2 libfaasm/core.cpp
+2 −2 libfaasm/faasm/core.h
+46 −2 libfaasm/faasm/host_interface.h
+10 −0 libfaasm/libfaasm.imports
+3 −3 tasks/docker.py
+8 −0 tasks/func.py