paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev-vagrant-docker: Upgrade docker-systemctl-replacement.

Browse Source 
This fixes the 45 second boot delay bug.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-06-24 19:40:08 -07:00
committed by Tim Abbott
parent 4dc206ad2e
commit 0f30c8c4ba
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/setup/dev-vagrant-docker/Dockerfile
View File

@@ -32,14 +32,13 @@ RUN \
# managed by systemd start within Docker, which breaks normal # managed by systemd start within Docker, which breaks normal
# operation of systemd. # operation of systemd.
dpkg-divert --add --rename /bin/systemctl \ dpkg-divert --add --rename /bin/systemctl \
&& curl -so /bin/systemctl 'https://raw.githubusercontent.com/gdraheim/docker-systemctl-replacement/b0588e003562f9a8eb76c98512c6d61146a81980/files/docker/systemctl3.py' \ && curl -so /bin/systemctl 'https://raw.githubusercontent.com/gdraheim/docker-systemctl-replacement/73b5aff2ba6abfd254d236f1df22ff4971d44660/files/docker/systemctl3.py' \
&& chmod +x /bin/systemctl \ && chmod +x /bin/systemctl \
&& ln -nsf /bin/true /usr/sbin/policy-rc.d \ && ln -nsf /bin/true /usr/sbin/policy-rc.d \
&& mkdir -p /run/sshd \ && mkdir -p /run/sshd \
# docker-systemctl-replacement doesn’t work with template units yet: # docker-systemctl-replacement doesn’t work with template units yet:
# https://github.com/gdraheim/docker-systemctl-replacement/issues/62 # https://github.com/gdraheim/docker-systemctl-replacement/issues/62
&& ln -ns /lib/systemd/system/postgresql@.service /etc/systemd/system/postgresql@10-main.service \ && ln -ns /lib/systemd/system/postgresql@.service /etc/systemd/system/multi-user.target.wants/postgresql@10-main.service \
&& ln -s /etc/systemd/system/postgresql@10-main.service /etc/systemd/system/multi-user.target.wants/ \
# redis fails to start with the default configuration if IPv6 is disabled: # redis fails to start with the default configuration if IPv6 is disabled:
# https://github.com/antirez/redis/pull/5598 # https://github.com/antirez/redis/pull/5598
&& dpkg-divert --add --rename /etc/default/redis-server \ && dpkg-divert --add --rename /etc/default/redis-server \