Commit 6f620c22 authored by Jelmer Vernooij's avatar Jelmer Vernooij Committed by Holger Levsen
Browse files

janitor: Use podman to run worker container.



Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent cae18bea
...@@ -8,7 +8,6 @@ DEBUG=true ...@@ -8,7 +8,6 @@ DEBUG=true
. /srv/jenkins/bin/common-functions.sh . /srv/jenkins/bin/common-functions.sh
common_init "$@" common_init "$@"
sudo adduser jenkins docker sudo sysctl kernel.unprivileged_userns_clone=1
docker pull eu.gcr.io/debian-janitor/worker
# vim: set sw=0 noet : # vim: set sw=0 noet :
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -e set -e
docker run --rm --cap-add=SYS_ADMIN --privileged \ podman run --pull always --rm --cap-add=SYS_ADMIN --privileged \
--memory=20g \ --memory=20g \
-v /srv/janitor:/srv/janitor \ -v /srv/janitor:/srv/janitor \
-e BUILD_URL="${BUILD_URL}" \ -e BUILD_URL="${BUILD_URL}" \
......
...@@ -413,7 +413,7 @@ if [ -f /etc/debian_version ] ; then ...@@ -413,7 +413,7 @@ if [ -f /etc/debian_version ] ; then
esac esac
case $HOSTNAME in case $HOSTNAME in
osuosl167*) DEBS="$DEBS osuosl167*) DEBS="$DEBS
docker.io podman
" ;; " ;;
esac esac
# notifications are only done from a few nodes # notifications are only done from a few nodes
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment