Skip to content

chore: bump cpp-sysroot #55

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
csegarragonz merged 7 commits into from
Oct 24, 2025
Merged

chore: bump cpp-sysroot #55

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f0c52c
chore: bump cpp-sysroot to 0.8.0
csegarragonz Oct 23, 2025
5b29dcc
fix tensorflow compilation
csegarragonz Oct 23, 2025
3d631ee
docker: remove trailing backslash
csegarragonz Oct 23, 2025
2376c44
gha: remove rabe and jwt
csegarragonz Oct 23, 2025
59cbc78
nits from gemini
csegarragonz Oct 24, 2025
d481876
bump faasmctl
csegarragonz Oct 24, 2025
b6a222a
fix: bump faasm version
csegarragonz Oct 24, 2025
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 .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
if: ${{ needs.needs-build.outputs.needs-wasm == 'true' }}
runs-on: ubuntu-latest
container:
image: ghcr.io/faasm/examples-build:0.6.0_0.4.0
image: ghcr.io/faasm/examples-build:0.8.0_0.4.0
steps:
- name: "Checkout code"
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion cpp
Open in desktop
Submodule cpp updated 10 files
+2 −2 .env
+4 −4 .github/workflows/release.yml
+1 −1 .github/workflows/tests.yml
+1 −1 VERSION
+35 −11 docker/cpp-sysroot.dockerfile
+1 −1 docker/llvm.dockerfile
+1 −1 faasmtools/docker.py
+0 −1 libfaasmp/CMakeLists.txt
+3 −3 requirements.txt
+3 −3 tasks/docker.py
2 changes: 1 addition & 1 deletion docker/base.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS base
FROM ubuntu:24.04 AS base

RUN apt update \
&& apt install -y \
Expand Down
25 changes: 11 additions & 14 deletions docker/build.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG CPP_VERSION
ARG EXAMPLES_VERSION
# Base image is not re-built often and tag may lag behind
FROM ghcr.io/faasm/examples-base:0.6.0_0.4.0 AS base
FROM ghcr.io/faasm/examples-base:0.8.0_0.4.0 AS base
FROM ghcr.io/faasm/cpp-sysroot:${CPP_VERSION:-dead}

SHELL ["/bin/bash", "-c"]
Expand All @@ -10,23 +10,26 @@ ENV IN_DOCKER="on"
# Copy built OpenMPI from previous step
COPY --from=base /tmp/openmpi-4.1.0/ /tmp/openmpi-4.1.0/

# Install OpenMP
ARG DEBIAN_FRONTEND=noninteractive
RUN apt update \
&& apt install -y --no-install-recommends \
build-essential \
curl \
libomp-17-dev \
unzip

# Install OpenMPI
RUN cd /tmp/openmpi-4.1.0 \
&& make install \
&& cd /tmp \
&& rm -rf /tmp/openmpi-4.1.0 /tmp/openmpi-4.1.0.tar.bz2

# Install OpenMP
ARG DEBIAN_FRONTEND=noninteractive
RUN apt update \
&& apt install -y libomp-17-dev

# Install rust
RUN curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y \
&& source ~/.cargo/env \
&& rustup target add wasm32-wasip1


# Fetch the code and update submodules
ARG EXAMPLES_VERSION
RUN mkdir -p code \
Expand All @@ -46,9 +49,7 @@ RUN mkdir -p code \
&& git submodule update --init -f examples/LULESH \
&& git submodule update --init -f examples/libpng \
&& git submodule update --init -f examples/polybench \
&& git submodule update --init -f examples/rabe \
&& git submodule update --init -f examples/tensorflow \
&& git submodule update --init -f examples/tless-jwt
&& git submodule update --init -f examples/tensorflow

# Build the examples and demo functions
ENV PATH=${PATH}:/root/.cargo/bin
Expand All @@ -64,7 +65,6 @@ RUN cd /code/examples \
&& inv polybench --native \
# Build the WASM applications
&& inv ffmpeg \
&& inv jwt \
# ImageMagick needs libpng
&& inv libpng imagemagick \
&& inv kernels \
Expand All @@ -73,14 +73,11 @@ RUN cd /code/examples \
&& inv lammps --migration-net \
&& inv lulesh \
&& inv polybench \
&& inv rabe \
&& inv tensorflow \
# These demo functions link with the cross-compiled static libraries
&& inv func ffmpeg check \
&& inv func jwt test \
&& inv func lammps chain \
&& inv func mpi migrate \
&& inv func rabe test \
&& inv func tf check

# Prepare bashrc
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow
Open in desktop
Submodule tensorflow updated 1 files
+1 −1 tensorflow/lite/tools/make/download_dependencies.sh
3 changes: 0 additions & 3 deletions tasks/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ def build(ctx, ctr, nocache=False, push=False):
build_args=build_args,
)

if push:
push(ctx, [c])


@task(iterable=["ctr"])
def push(ctx, ctr):
Expand Down
6 changes: 3 additions & 3 deletions tasks/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from faasmtools.build import FAASM_LOCAL_DIR
from faasmtools.docker import ACR_NAME
from faasmtools.docker import CR_NAME
from faasmtools.env import get_version as get_cpp_version
from os import environ
from os.path import dirname, abspath, join
Expand All @@ -14,9 +14,9 @@

# Docker variables
EXAMPLES_BUILD_IMAGE_CTR = "examples-build-workon"
EXAMPLES_BUILD_IMAGE_NAME = "{}/examples-build".format(ACR_NAME)
EXAMPLES_BUILD_IMAGE_NAME = "{}/examples-build".format(CR_NAME)
EXAMPLES_BUILD_DOCKERFILE = join(DOCKER_ROOT, "build.dockerfile")
EXAMPLES_BASE_IMAGE_NAME = "{}/examples-base".format(ACR_NAME)
EXAMPLES_BASE_IMAGE_NAME = "{}/examples-base".format(CR_NAME)
EXAMPLES_BASE_DOCKERFILE = join(DOCKER_ROOT, "base.dockerfile")

# Shared files data
Expand Down
Loading