Skip to content

Commit 52b99d6

Browse files
committed
Bring changes up to speed
- Remove old podman fix - Use tmpfs for inner podman - Drop fuse
1 parent be666f1 commit 52b99d6

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

ci/container/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt -yq update && \
1010
apt -yqq install $(sed -e "s/#.*//" "/tmp/$(basename $PACKAGE_FILE)") && \
1111
rm "/tmp/$(basename $PACKAGE_FILE)"
1212

13-
RUN apt -yqq install --no-install-recommends podman containernetworking-plugins buildah zip fuse-overlayfs xtail
13+
RUN apt -yqq install --no-install-recommends podman containernetworking-plugins buildah zip xtail
1414

1515
# install afl & gsutils deps for bazel-fuzzers
1616
RUN curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | apt-key add - && \
@@ -137,9 +137,6 @@ USER ubuntu
137137
ENV PATH=/ic/bin:/home/ubuntu/.cargo/bin:/home/ubuntu/.local/bin:$PATH
138138
ENV PYTHONPATH=/ic/ci/src:/ic/ci/src/dependencies:$PYTHONPATH
139139

140-
# Make sure we own .local/share
141-
RUN mkdir -p /home/ubuntu/.local/share
142-
143140
# Pre-populate the Bazel installation for ubuntu
144141
RUN cd /tmp/bazel && bazel version
145142

ci/container/container-run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ PODMAN_RUN_ARGS+=(
135135
--mount type=bind,source="${ICT_TESTNETS_DIR}",target="${ICT_TESTNETS_DIR}",idmap="${IDMAP}"
136136
--mount type=bind,source="${HOME}/.ssh",target="${CTR_HOME}/.ssh",idmap="${IDMAP}"
137137
--mount type=bind,source="${HOME}/.aws",target="${CTR_HOME}/.aws",idmap="${IDMAP}"
138+
--mount type=tmpfs,target="/home/ubuntu/.local/share/containers"
138139
)
139140

140141
if [ "$(id -u)" = "1000" ]; then

ic-os/components/guestos/selinux/prep.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,5 @@ sed -e 's/detected_mods := \(.*\)/detected_mods := $(sort \1)/' -i /usr/share/se
1212
# Build SELinux modules
1313
make -f /usr/share/selinux/devel/Makefile
1414

15-
# Force unsharing of directory -- seems to be a docker bug
16-
mv /var/lib/selinux/default/active /var/lib/selinux/default/active.unshare
17-
mv /var/lib/selinux/default/active.unshare /var/lib/selinux/default/active
18-
1915
# Install them
2016
semodule -i *.pp

0 commit comments

Comments
 (0)