Back to tini as PID1 and adjust priority

This commit is contained in:
Daniel Berteaud 2024-01-21 22:28:16 +01:00
parent 8451fb2b2d
commit 87da3cead4
6 changed files with 10 additions and 16 deletions

View File

@ -51,5 +51,4 @@ RUN set -eux &&\
COPY root/ /
USER apache
ENTRYPOINT ["minit"]
CMD []
CMD ["minit"]

View File

@ -1,5 +0,0 @@
---
kind: once
name: entrypoint
command: ["/entrypoint.sh"]

View File

@ -2,6 +2,7 @@ job "lemonldap-ng" {
datacenters = ["dc1"]
priority = 60
group "lemonldap-ng" {
@ -82,7 +83,7 @@ job "lemonldap-ng" {
driver = "docker"
config {
image = "danielberteaud/lemonldap-ng:2.18.1-8"
image = "danielberteaud/lemonldap-ng:2.18.1-9"
readonly_rootfs = true
pids_limit = 200
volumes = [

View File

@ -51,5 +51,4 @@ RUN set -eux &&\
COPY root/ /
USER apache
ENTRYPOINT ["minit"]
CMD []
CMD ["minit"]

View File

@ -1,5 +0,0 @@
---
kind: once
name: entrypoint
command: ["/entrypoint.sh"]

View File

@ -4,6 +4,11 @@ instance: lemonldap-ng
llng:
# A lot of services depends on lemonldap
# so make it a bit higher priority than normal
nomad:
priority: 60
# The same engine can run portal, manager and handler
# The settings below are for the uwsgi engine itself
engine:
@ -12,7 +17,7 @@ llng:
count: 1
# Docker image to use
image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-8'
image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-9'
# Resource allocation
resources: