Skip to content

Commit 6f0c52c

Browse files
committed
chore: bump cpp-sysroot to 0.8.0
1 parent 59d4d2c commit 6f0c52c

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
if: ${{ needs.needs-build.outputs.needs-wasm == 'true' }}
6262
runs-on: ubuntu-latest
6363
container:
64-
image: ghcr.io/faasm/examples-build:0.6.0_0.4.0
64+
image: ghcr.io/faasm/examples-build:0.8.0_0.4.0
6565
steps:
6666
- name: "Checkout code"
6767
uses: actions/checkout@v4

docker/base.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04 AS base
1+
FROM ubuntu:24.04 AS base
22

33
RUN apt update \
44
&& apt install -y \

docker/build.dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG CPP_VERSION
22
ARG EXAMPLES_VERSION
33
# Base image is not re-built often and tag may lag behind
4-
FROM ghcr.io/faasm/examples-base:0.6.0_0.4.0 AS base
4+
FROM ghcr.io/faasm/examples-base:0.8.0_0.4.0 AS base
55
FROM ghcr.io/faasm/cpp-sysroot:${CPP_VERSION:-dead}
66

77
SHELL ["/bin/bash", "-c"]
@@ -10,23 +10,25 @@ ENV IN_DOCKER="on"
1010
# Copy built OpenMPI from previous step
1111
COPY --from=base /tmp/openmpi-4.1.0/ /tmp/openmpi-4.1.0/
1212

13+
# Install OpenMP
14+
ARG DEBIAN_FRONTEND=noninteractive
15+
RUN apt update \
16+
&& apt install -y --no-install-recommends \
17+
build-essential \
18+
curl \
19+
libomp-17-dev
20+
1321
# Install OpenMPI
1422
RUN cd /tmp/openmpi-4.1.0 \
1523
&& make install \
1624
&& cd /tmp \
1725
&& rm -rf /tmp/openmpi-4.1.0 /tmp/openmpi-4.1.0.tar.bz2
1826

19-
# Install OpenMP
20-
ARG DEBIAN_FRONTEND=noninteractive
21-
RUN apt update \
22-
&& apt install -y libomp-17-dev
23-
2427
# Install rust
2528
RUN curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y \
2629
&& source ~/.cargo/env \
2730
&& rustup target add wasm32-wasip1
2831

29-
3032
# Fetch the code and update submodules
3133
ARG EXAMPLES_VERSION
3234
RUN mkdir -p code \

tasks/docker.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ def build(ctx, ctr, nocache=False, push=False):
5555
build_args=build_args,
5656
)
5757

58-
if push:
59-
push(ctx, [c])
60-
6158

6259
@task(iterable=["ctr"])
6360
def push(ctx, ctr):

tasks/env.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from faasmtools.build import FAASM_LOCAL_DIR
2-
from faasmtools.docker import ACR_NAME
2+
from faasmtools.docker import CR_NAME
33
from faasmtools.env import get_version as get_cpp_version
44
from os import environ
55
from os.path import dirname, abspath, join
@@ -14,9 +14,9 @@
1414

1515
# Docker variables
1616
EXAMPLES_BUILD_IMAGE_CTR = "examples-build-workon"
17-
EXAMPLES_BUILD_IMAGE_NAME = "{}/examples-build".format(ACR_NAME)
17+
EXAMPLES_BUILD_IMAGE_NAME = "{}/examples-build".format(CR_NAME)
1818
EXAMPLES_BUILD_DOCKERFILE = join(DOCKER_ROOT, "build.dockerfile")
19-
EXAMPLES_BASE_IMAGE_NAME = "{}/examples-base".format(ACR_NAME)
19+
EXAMPLES_BASE_IMAGE_NAME = "{}/examples-base".format(CR_NAME)
2020
EXAMPLES_BASE_DOCKERFILE = join(DOCKER_ROOT, "base.dockerfile")
2121

2222
# Shared files data

0 commit comments

Comments
 (0)