File tree Expand file tree Collapse file tree 3 files changed +23
-1
lines changed
Expand file tree Collapse file tree 3 files changed +23
-1
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ devmaster_id_rsa.pub
2424bin /*
2525~bin /devshop
2626! bin /branch-or-tag
27- ! bin /docker-entrypoint
27+ ! bin /docker *
2828! bin /hosting-queue-runner
2929! bin /mysql-wait
3030
Original file line number Diff line number Diff line change @@ -73,6 +73,9 @@ RUN chmod 766 $DEVSHOP_TESTS_ASSETS_PATH
7373
7474RUN ansible --version
7575
76+ # Cleanup unwanted systemd files. See bin/docker-systemd-clean.
77+ RUN docker-systemd-clean
78+
7679# Remove Home Directory if desired so that devshop code is reinstalled.
7780RUN if [ $DEVSHOP_REBUILD_HOME ]; then rm -rf /var/aegir; fi
7881
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+ set -e
3+
4+ devshop-logo " Cleaning up SystemD"
5+ echo " This should only be run inside a container with SystemD."
6+ echo " See https://github.com/geerlingguy/docker-ubuntu1804-ansible/pull/12"
7+
8+ # @TODO: Make this multi-os, and determine if there are any unwanted side effects.
9+ # The "ls" command should fail, breaking any build without this path.
10+ ls -la /lib/systemd
11+
12+ find /lib/systemd/system/sysinit.target.wants/* ! -name systemd-tmpfiles-setup.service -delete;
13+ rm -f /lib/systemd/system/multi-user.target.wants/* ;
14+ rm -f /etc/systemd/system/* .wants/* ;
15+ rm -f /lib/systemd/system/local-fs.target.wants/* ;
16+ rm -f /lib/systemd/system/sockets.target.wants/* udev* ;
17+ rm -f /lib/systemd/system/sockets.target.wants/* initctl* ;
18+ rm -f /lib/systemd/system/basic.target.wants/* ;
19+ rm -f /lib/systemd/system/anaconda.target.wants/* ; find /lib/systemd/system/sysinit.target.wants/* ! -name systemd-tmpfiles-setup.service -delete;
You can’t perform that action at this time.
0 commit comments