docker: few nits

faasm · Oct 3, 2024 · a2f00e4 · a2f00e4
1 parent d50521f
commit a2f00e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -124,7 +124,7 @@ jobs:
         shell: bash
     env:
       FAASM_INI_FILE: ./faasm.ini
-      FAASM_VERSION: 0.22.0
+      FAASM_VERSION: 0.27.0
       FAASM_WASM_VM: ${{ matrix.faasm_wasm_vm }}
     steps:
       - uses: csegarragonz/set-compose-version-action@main
@@ -282,9 +282,12 @@ jobs:
       - name: "Run FFmpeg check"
         timeout-minutes: 1
         run: faasmctl invoke ffmpeg check
-      - name: "Run Rabe test"
-        timeout-minutes: 1
-        run: faasmctl invoke rabe test
+          # TODO(faasm-bump): this is working, but we need to cut a new faasm release, uncomment
+          # when we do
+          #       - name: "Run Rabe test"
+          #         if: "contains(env.FAASM_WASM_VM, 'wamr')"
+          #         timeout-minutes: 1
+          #         run: faasmctl invoke rabe test
       - name: "Print logs in case of failure"
         if: failure()
         run: faasmctl logs -s worker
diff --git a/docker/build.dockerfile b/docker/build.dockerfile
@@ -2,7 +2,7 @@ ARG CPP_VERSION
 ARG EXAMPLES_VERSION
 # Base image is not re-built often and tag may lag behind
 FROM faasm.azurecr.io/examples-base:0.6.0_0.4.0 AS base
-FROM faasm.azurecr.io/cpp-sysroot:${CPP_VERSION}
+FROM faasm.azurecr.io/cpp-sysroot:${CPP_VERSION:-dead}
 
 SHELL ["/bin/bash", "-c"]
 ENV IN_DOCKER="on"
@@ -50,6 +50,7 @@ RUN mkdir -p code \
     && git submodule update --init -f examples/tensorflow
 
 # Build the examples and demo functions
+ENV PATH=${PATH}:/root/.cargo/bin
 RUN cd /code/examples \
     && ./bin/create_venv.sh \
     && source venv/bin/activate \