diff options
author | Zuul <zuul@review.opendev.org> | 2023-05-17 18:42:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-05-17 18:42:53 +0000 |
commit | deab00c8bd37b2d8e8c223cb10e7585e54282250 (patch) | |
tree | 9ac0a387037bfa2d8a06d7b8bb6ecd0a13269597 /Dockerfile | |
parent | 38423ed88373b909b864fc0bdf5d7268137b242e (diff) | |
parent | 0937872119e642b3fc689fc2bf156e44dccf140d (diff) | |
download | zuul-deab00c8bd37b2d8e8c223cb10e7585e54282250.tar.gz |
Merge "Use bwrap --disable-userns if possible"
Diffstat (limited to 'Dockerfile')
-rw-r--r-- | Dockerfile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index df326bd8a..588de4b8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,6 +63,11 @@ ENV DEBIAN_FRONTEND=noninteractive COPY --from=builder /output/ /output RUN /output/install-from-bindep zuul_base \ +# Install newer bwrap from backports for --disable-userns support (>=0.8.0) + && apt-get update \ + && apt-get install -y bubblewrap/bullseye-backports \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ && rm -rf /output \ && useradd -u 10001 -m -d /var/lib/zuul -c "Zuul Daemon" zuul \ # This enables git protocol v2 which is more efficient at negotiating |