Skip to content

Commit

Permalink
[Elao - App - Docker] Switch to systemd
Browse files Browse the repository at this point in the history
  • Loading branch information
nervo committed Apr 12, 2024
1 parent 7c9e9c6 commit b25d27a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion elao.app.docker/.manala/Makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MANALA_DOCKER_COMPOSE_ENV += \
MANALA_HOST_OS=$(MANALA_OS) \
MANALA_HOST_DIR=$(abspath $(MANALA_DIR))
MANALA_DOCKER_COMPOSE_FILE += \
$(MANALA_DIR)/.manala/docker/compose/init.sysv.yaml \
$(MANALA_DIR)/.manala/docker/compose/init.systemd.yaml \
$(if $(SYMFONY_IDE), $(MANALA_DIR)/.manala/docker/compose/symfony.yaml)
MANALA_DOCKER_COMPOSE_PROFILE ?= development

Expand Down
5 changes: 3 additions & 2 deletions elao.app.docker/.manala/docker/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,18 @@ RUN \
> /etc/sudoers.d/systemd \
&& rm -rf \
/etc/systemd/system/*.wants/* \
/lib/systemd/system/basic.target.wants/* \
/lib/systemd/system/multi-user.target.wants/* \
/lib/systemd/system/local-fs.target.wants/* \
/lib/systemd/system/sockets.target.wants/*udev* \
/lib/systemd/system/sockets.target.wants/*initctl* \
/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev* \
/lib/systemd/system/systemd-ask-password-console.* \
/lib/systemd/system/systemd-tmpfiles-clean.* \
/lib/systemd/system/systemd-update-utmp* \
# Clean
&& rm -rf /var/lib/apt/lists/*

VOLUME /sys/fs/cgroup

STOPSIGNAL SIGRTMIN+3

CMD ["/lib/systemd/systemd"]
Expand Down
5 changes: 4 additions & 1 deletion elao.app.docker/.manala/docker/compose/init.systemd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ services:
build:
args:
MANALA_INIT: systemd
cgroup: host
tty: true
privileged: true
tmpfs:
- /run
- /run/lock
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw

0 comments on commit b25d27a

Please sign in to comment.