Skip to content

[Elao - App - Docker] Switch to systemd #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[Elao - App - Docker] Switch to systemd #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47293a8
[Elao - App - Docker] Switch to systemd
nervo Dec 12, 2023
9691cbb
maybe ?
nervo Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elao.app.docker/.manala/Makefile.tmpl
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion elao.app.docker/.manala/ansible/templates/ohmyzsh/functions/nginx_timeout.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
manala_nginx_timeout () {
if [[ $1 == off ]]; then sudo sed -ri 's/fastcgi_read_timeout (.*);$/fastcgi_read_timeout 999s;#origin\1/' /etc/nginx/conf.d/php_fpm_app
else sudo sed -ri 's/^fastcgi_read_timeout 999s;#origin(.*)/fastcgi_read_timeout \1;/' /etc/nginx/conf.d/php_fpm_app; fi
sudo /etc/init.d/nginx restart
sudo systemctl restart nginx
}

echo -e " \e[36m‣\e[0m \e[36mENABLE/DISABLE NGINX TIMEOUT\e[0m
Expand Down
5 changes: 3 additions & 2 deletions elao.app.docker/.manala/docker/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,16 @@ 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*

VOLUME /sys/fs/cgroup

STOPSIGNAL SIGRTMIN+3

CMD ["/lib/systemd/systemd"]
Expand Down
7 changes: 6 additions & 1 deletion elao.app.docker/.manala/docker/compose/init.systemd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ services:
build:
args:
MANALA_INIT: systemd
cgroup: host
tty: true
privileged: true
tmpfs:
- /run
- /run/lock
security_opt:
- apparmor=unconfined
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
2 changes: 1 addition & 1 deletion elao.app.docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MacOS

* Docker Desktop 4.29.0+
(`brew install docker`)
* Mutagen Compose 0.17.5+
* Mutagen Compose 0.18.0+
(`brew install mutagen-io/mutagen/mutagen-compose`)

Linux
Expand Down
Loading