From 3cbc790abf1cf98b24c2ae1c4176085200a932e2 Mon Sep 17 00:00:00 2001 From: Jan Horstmann Date: Mon, 16 Sep 2019 13:37:19 +0200 Subject: Remove exemption for non-systemd Ubuntu in bifrost Unneeded systemd units were never removed for Ubuntu 18.04. Since Ubuntu 14.04 is no longer supported, this commit removes the exemption for it. Change-Id: I764a0e305a95ee9e330041f1e15d35b45a86aa72 --- docker/bifrost/bifrost-deploy/Dockerfile.j2 | 32 ---------------------------- docker/bifrost/bifrost-deploy/init-fake.conf | 14 ------------ 2 files changed, 46 deletions(-) delete mode 100644 docker/bifrost/bifrost-deploy/init-fake.conf (limited to 'docker') diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index c071d716e..ff5cc73d1 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/docker/bifrost/bifrost-deploy/Dockerfile.j2 @@ -7,8 +7,6 @@ ENV container docker {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %} - RUN rm -f $(find /lib/systemd/system/sysinit.target.wants/ ! -name systemd-tmpfiles-setup.service -type l); \ rm -f /lib/systemd/system/multi-user.target.wants/*; \ rm -f /etc/systemd/system/*.wants/*; \ @@ -18,36 +16,6 @@ RUN rm -f $(find /lib/systemd/system/sysinit.target.wants/ ! -name systemd-tmpfi rm -f /lib/systemd/system/basic.target.wants/*; \ rm -f /lib/systemd/system/anaconda.target.wants/*; -{% elif base_distro in ['ubuntu'] %} - -# derived from https://raw.githubusercontent.com/tianon/dockerfiles/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile -ADD init-fake.conf /etc/init/fake-container-events.conf - -# undo some leet hax of the base image -RUN rm /usr/sbin/policy-rc.d; \ - rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl - -# remove some pointless services -RUN /usr/sbin/update-rc.d -f ondemand remove; \ - for f in \ - /etc/init/u*.conf \ - /etc/init/mounted-dev.conf \ - /etc/init/mounted-proc.conf \ - /etc/init/mounted-run.conf \ - /etc/init/mounted-tmp.conf \ - /etc/init/mounted-var.conf \ - /etc/init/hostname.conf \ - /etc/init/networking.conf \ - /etc/init/tty*.conf \ - /etc/init/plymouth*.conf \ - /etc/init/hwclock*.conf \ - /etc/init/module*.conf\ - ; do \ - dpkg-divert --local --rename --add "$f"; \ - done; \ - echo '# /lib/init/fstab: cleared out for bare-bones Docker' > /lib/init/fstab -{% endif %} - {% set bifrost_deploy_packages = [ 'e2fsprogs' ] %} diff --git a/docker/bifrost/bifrost-deploy/init-fake.conf b/docker/bifrost/bifrost-deploy/init-fake.conf deleted file mode 100644 index 00a8f8ccd..000000000 --- a/docker/bifrost/bifrost-deploy/init-fake.conf +++ /dev/null @@ -1,14 +0,0 @@ -# copied from https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/init-fake.conf -# fake some events needed for correct startup other services - -description "In-Container Upstart Fake Events" - -start on startup - -script - rm -rf /var/run/*.pid - rm -rf /var/run/network/* - /sbin/initctl emit stopped JOB=udevtrigger --no-wait - /sbin/initctl emit started JOB=udev --no-wait - /sbin/initctl emit runlevel RUNLEVEL=3 --no-wait -end script -- cgit v1.2.3