Migrate from DockerHub to ACR (#112)

* gh: bump code version

* docker: move to acr

* docker: change parent image in cpp-sysroot

* gha: use credentials for tests

* docker: change parent image for faabric-base too

Author: csegarragonz

.env

@@ -1,3 +1,3 @@
-SYSROOT_VERSION=0.2.3
-SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.2.3
+SYSROOT_VERSION=0.2.4
+SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.4
 COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/release.yml

@@ -26,14 +26,15 @@ jobs:
       - name: "Log in to DockerHub"
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          registry: faasm.azurecr.io
+          username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
+          password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       - name: "Build and push cpp-sysroot container"
         id: docker_build
         uses: docker/build-push-action@v3
         with:
           push: true
           file: docker/cpp-sysroot.dockerfile
           context: .
-          tags: faasm/cpp-sysroot:${{ env.TAG_VERSION }}
+          tags: faasm.azurecr.io/cpp-sysroot:${{ env.TAG_VERSION }}
           build-args: SYSROOT_VERSION=${{ env.TAG_VERSION }}

.github/workflows/tests.yml

@@ -19,7 +19,10 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm/cpp-sysroot:0.2.3
+      image: faasm.azurecr.io/cpp-sysroot:0.2.4
+      credentials:
+        username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
+        password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     steps:
       # --- Update code ---
       - name: "Checkout code"

VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

docker/cpp-sysroot.dockerfile

@@ -1,8 +1,8 @@
 # llvm image is not re-built often, so the tag may be behind
-FROM faasm/llvm:0.2.3 as llvm
+FROM faasm.azurecr.io/llvm:0.2.4 as llvm
 
 # faabric-base image is not re-built often, so tag may be behind
-FROM faasm/faabric-base:0.4.1
+FROM faasm.azurecr.io/faabric-base:0.4.2
 SHELL ["/bin/bash", "-c"]
 ENV CPP_DOCKER="on"
 

faasmtools/docker.py

@@ -1,10 +1,11 @@
 from subprocess import run
 
+ACR_NAME = "faasm.azurecr.io"
+
 
 def build_container(
     tag_name, dockerfile, cwd, nocache=False, push=False, build_args=None
 ):
-
     build_args = build_args if build_args else dict()
 
     if nocache:

tasks/docker.py

@@ -1,20 +1,18 @@
-from invoke import task
-
-from os.path import join
-
 from faasmtools.docker import (
     build_container,
     push_container,
+    ACR_NAME,
 )
-
 from faasmtools.env import (
     get_version,
     PROJ_ROOT,
 )
+from invoke import task
+from os.path import join
 
-LLVM_IMAGE_NAME = "faasm/llvm"
+LLVM_IMAGE_NAME = "{}/llvm".format(ACR_NAME)
 LLVM_DOCKERFILE = join(PROJ_ROOT, "docker", "llvm.dockerfile")
-SYSROOT_IMAGE_NAME = "faasm/cpp-sysroot"
+SYSROOT_IMAGE_NAME = "{}/cpp-sysroot".format(ACR_NAME)
 SYSROOT_DOCKERFILE = join(PROJ_ROOT, "docker", "cpp-sysroot.dockerfile")