Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bots: Drop docker resolv.conf hack from Debian/Ubuntu images #9043

Merged
merged 6 commits into from
Apr 26, 2018
+4 −13
Merged

bots: Drop docker resolv.conf hack from Debian/Ubuntu images #9043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec17266
bots: Drop docker resolv.conf hack from Debian/Ubuntu images
martinpitt Apr 25, 2018
bf92350
bots: Put back pcp dependencies onto debian-testing image
martinpitt Apr 25, 2018
9372f0f
images: Update debian-testing image
Apr 25, 2018
33238cd
images: Update debian-stable image
Apr 25, 2018
575e699
images: Update ubuntu-1604 image
Apr 25, 2018
c1917b7
images: Update ubuntu-stable image
Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bots/images/debian-stable
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
debian-stable-2865957f1ffc70cd7ebdd4fc7651f2314a19736493af7b1c6e8a909d1403a066.qcow2
debian-stable-96ee6404b8b20122ad4639d4f71e6fd915fe5dfa4b8a9d4b3838276f1668c47b.qcow2
2 changes: 1 addition & 1 deletion bots/images/debian-testing
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
debian-testing-6522ec67f4e558ad8ef273d802626f292f2448e41ec6cd5ceece25304845328c.qcow2
debian-testing-7aa1424158e8521dce5f23f197b32bdd193a7408e50704af3a5d3699c3785d04.qcow2
9 changes: 0 additions & 9 deletions bots/images/scripts/debian.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ case "$RELEASE" in
;;

testing)
# https://tracker.debian.org/pcp not currently in testing
COCKPIT_DEPS="${COCKPIT_DEPS/libpcp3 /}"
COCKPIT_DEPS="${COCKPIT_DEPS/pcp /}"
COCKPIT_DEPS="${COCKPIT_DEPS} libblockdev-mdraid2 udisks2-lvm2"

# docker.io got removed from testing; use backports-version
Expand Down Expand Up @@ -137,12 +134,6 @@ systemctl disable apt-daily.service apt-daily.timer || true
echo "kernel.core_pattern=|/lib/systemd/systemd-coredump %P %u %g %s %t %c %e" > /etc/sysctl.d/50-coredump.conf
printf 'DefaultLimitCORE=infinity\n' >> /etc/systemd/system.conf

# HACK: docker fails without /etc/resolv.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1448331
mkdir -p /etc/systemd/system/docker.service.d
printf "[Service]\nExecStartPre=/bin/sh -c 'echo -n >> /etc/resolv.conf'\n" > /etc/systemd/system/docker.service.d/resolv.conf
systemctl daemon-reload

# HACK: we need to restart it in case aufs-dkms was installed after docker.io
# and thus docker.io auto-switches its backend
systemctl restart docker || journalctl -u docker
Expand Down
2 changes: 1 addition & 1 deletion bots/images/ubuntu-1604
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ubuntu-1604-f5793376cca661d19f4888339000d1f7c49430f09891b080ad8d709b1fbe6206.qcow2
ubuntu-1604-6823f032bfecbb90401b95e527e25c9aed989a9cc458c612fe451b4c6391dede.qcow2
2 changes: 1 addition & 1 deletion bots/images/ubuntu-stable
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ubuntu-stable-3218549bc200d1718cd6d5e3bef5e6e520d1c423ac676a4f8ec72f08fb8dd343.qcow2
ubuntu-stable-ab368e6d389e94014ea16b09eb9c4ba85081a105decab59efef642184b4bfb01.qcow2