Skip to content

Commit 91a49c2

Browse files
committed
fix(ffi): install missing package
1 parent 0aa1e96 commit 91a49c2

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ jobs:
3737
- name: "Build libfaasmpi"
3838
run: ./bin/inv_wrapper.sh libfaasmpi
3939
- name: "Build libffi"
40-
run: |
41-
# For some reason, libffi necessitates running apt update.
42-
apt update
43-
./bin/inv_wrapper.sh libffi
40+
run: ./bin/inv_wrapper.sh libffi
4441
- name: "Build libfake"
4542
run: ./bin/inv_wrapper.sh libfake
4643
- name: "Build libemscripten"

docker/cpp-sysroot.dockerfile

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,30 @@ FROM ghcr.io/faasm/llvm:0.7.0 AS llvm
44
# Start from a fresh ubuntu image, cpp-sysroot has little built deps.
55
FROM ubuntu:24.04
66

7-
RUN set -eux; \
8-
apt update; \
9-
apt install -y --no-install-recommends \
7+
RUN apt update \
8+
&& apt install -y --no-install-recommends \
109
autoconf \
1110
automake \
1211
autopoint \
1312
autotools-dev \
1413
clang-17 \
1514
cmake \
15+
dpkg-dev \
16+
gawk \
1617
gettext \
18+
git \
19+
libltdl-dev \
1720
libtool \
1821
llvm-17 \
22+
make \
1923
m4 \
2024
ninja-build \
21-
make \
2225
pkg-config \
2326
python3-pip \
2427
python3-venv \
25-
git \
26-
vim-tiny; \
27-
apt autoremove -y; \
28-
apt clean; rm -rf /var/lib/apt/lists/*
28+
vim-tiny \
29+
&& apt autoremove \
30+
&& rm -rf /var/lib/apt/lists/*
2931

3032
SHELL ["/bin/bash", "-c"]
3133
ENV CPP_DOCKER="on"
@@ -76,16 +78,12 @@ RUN cd /code/cpp \
7678
libfaasm --threads \
7779
libemscripten --threads \
7880
libfaasmp \
79-
# Lastly, build the libraries that populate the sysroot. For some reason
80-
# we need to re-run apt update for libtool to work properly.
81-
&& apt update \
81+
# Lastly, build the libraries that populate the sysroot
8282
&& inv \
8383
libffi \
8484
libffi --threads \
8585
zlib \
86-
zlib --threads \
87-
&& apt autoremove -y \
88-
&& apt clean; rm -rf /var/lib/apt/lists/*
86+
zlib --threads
8987

9088
# CLI setup
9189
WORKDIR /code/cpp

0 commit comments

Comments
 (0)