Skip to content

Commit ede0ea5

Browse files
authored
Merge pull request #220 from boegel/bwrap
2 parents 0742cdd + 1add6ee commit ede0ea5

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

.github/workflows/test-containers.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ jobs:
1212
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
1313
- name: Build the Docker image
1414
run: docker build . --file containers/Dockerfile.EESSI-client-rocky8
15+
test-build-container:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
19+
- name: Build the Docker image
20+
run: docker build . --file containers/Dockerfile.EESSI-build-node-debian11

containers/Dockerfile.EESSI-build-node-debian11

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG cvmfsversion=2.13.0
22
ARG awscliversion=1.32.22
33
ARG fuseoverlayfsversion=1.10
4+
ARG bwrapversion=0.11.0
45

56
FROM debian:11.7 AS prepare-deb
67
ARG cvmfsversion
@@ -12,6 +13,7 @@ FROM debian:11.5
1213
ARG cvmfsversion
1314
ARG awscliversion
1415
ARG fuseoverlayfsversion
16+
ARG bwrapversion
1517

1618
COPY --from=prepare-deb /root/deb /root/deb
1719

@@ -39,3 +41,19 @@ RUN useradd -ms /bin/bash eessi
3941

4042
# stick to awscli v1.x, 2.x is not available through PyPI (see https://github.com/aws/aws-cli/issues/4947)
4143
RUN pip3 install archspec awscli==${awscliversion}
44+
45+
# build + install bwrap from source
46+
RUN apt-get install -y libcap-dev meson ninja-build pkg-config \
47+
&& curl -OL https://github.com/containers/bubblewrap/releases/download/v${bwrapversion}/bubblewrap-${bwrapversion}.tar.xz \
48+
&& tar xvf bubblewrap-${bwrapversion}.tar.xz \
49+
&& cd bubblewrap-${bwrapversion} \
50+
&& meson setup _build \
51+
&& meson compile -C _build \
52+
&& meson test -C _build \
53+
&& meson install -C _build \
54+
&& which bwrap \
55+
&& bwrap --version \
56+
&& bwrap --help \
57+
&& cd .. \
58+
&& rm -r bubblewrap-${bwrapversion} \
59+
&& apt-get remove -y libcap-dev meson ninja-build pkg-config

0 commit comments

Comments
 (0)