Skip to content

Commit b25d27a

Browse files
committed
[Elao - App - Docker] Switch to systemd
1 parent 7c9e9c6 commit b25d27a

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

elao.app.docker/.manala/Makefile.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ MANALA_DOCKER_COMPOSE_ENV += \
3131
MANALA_HOST_OS=$(MANALA_OS) \
3232
MANALA_HOST_DIR=$(abspath $(MANALA_DIR))
3333
MANALA_DOCKER_COMPOSE_FILE += \
34-
$(MANALA_DIR)/.manala/docker/compose/init.sysv.yaml \
34+
$(MANALA_DIR)/.manala/docker/compose/init.systemd.yaml \
3535
$(if $(SYMFONY_IDE), $(MANALA_DIR)/.manala/docker/compose/symfony.yaml)
3636
MANALA_DOCKER_COMPOSE_PROFILE ?= development
3737

elao.app.docker/.manala/docker/Dockerfile.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,18 @@ RUN \
175175
> /etc/sudoers.d/systemd \
176176
&& rm -rf \
177177
/etc/systemd/system/*.wants/* \
178+
/lib/systemd/system/basic.target.wants/* \
178179
/lib/systemd/system/multi-user.target.wants/* \
179180
/lib/systemd/system/local-fs.target.wants/* \
180181
/lib/systemd/system/sockets.target.wants/*udev* \
181182
/lib/systemd/system/sockets.target.wants/*initctl* \
182183
/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev* \
184+
/lib/systemd/system/systemd-ask-password-console.* \
185+
/lib/systemd/system/systemd-tmpfiles-clean.* \
183186
/lib/systemd/system/systemd-update-utmp* \
184187
# Clean
185188
&& rm -rf /var/lib/apt/lists/*
186189

187-
VOLUME /sys/fs/cgroup
188-
189190
STOPSIGNAL SIGRTMIN+3
190191

191192
CMD ["/lib/systemd/systemd"]

elao.app.docker/.manala/docker/compose/init.systemd.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ services:
88
build:
99
args:
1010
MANALA_INIT: systemd
11+
cgroup: host
1112
tty: true
12-
privileged: true
13+
tmpfs:
14+
- /run
15+
- /run/lock
1316
volumes:
1417
- /sys/fs/cgroup:/sys/fs/cgroup:rw

0 commit comments

Comments
 (0)