nomad
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing Devel::StackTrace and use minit as PID1

This commit is contained in:
Daniel Berteaud 2024-01-21 22:30:57 +01:00
parent 7feb6c5513
commit 8451fb2b2d
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/images/lemonldap-ng/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alma:9.24.1-5
FROM danielberteaud/alma:9.24.1-6
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG LLNG_VERSION=2.18.1
@ -29,6 +29,7 @@ RUN set -eux &&\
uwsgi-plugin-psgi \
lasso \
lasso-perl \
perl-Devel-StackTrace \
perl-DBD-Pg \
perl-Cache-Cache \
perl-Apache-Session-Browseable \
@ -50,4 +51,5 @@ RUN set -eux &&\
COPY root/ /
USER apache
CMD ["minit"]
ENTRYPOINT ["minit"]
CMD []

5
example/images/lemonldap-ng/root/etc/minit.d/entrypoint.yml Normal file
View File

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

4
example/lemonldap-ng.nomad.hcl
View File

@ -82,12 +82,13 @@ job "lemonldap-ng" {
driver = "docker"
config {
image = "danielberteaud/lemonldap-ng:2.18.1-7"
image = "danielberteaud/lemonldap-ng:2.18.1-8"
readonly_rootfs = true
pids_limit = 200
volumes = [
"secrets/lemonldap-ng.ini:/etc/lemonldap-ng/lemonldap-ng.ini:ro",
"local/init-db.sh:/entrypoint.d/20-initdb.sh:ro",
"local/minit.d/lemonldap-ng.yml:/etc/minit.d/lemonldap-ng.yml:ro"
]
mount {
type = "tmpfs"
@ -120,7 +121,6 @@ job "lemonldap-ng" {
LLNG_MANAGER_VHOST = "manager.example.org"
LLNG_PORTAL_VHOST = "sso.example.org"
LLNG_CUSTOM_ASSETS_DIR = "/local/assets"
MINIT_UNIT_DIR = "/local/minit.d"
}

4
images/lemonldap-ng/Dockerfile
View File

@ -29,6 +29,7 @@ RUN set -eux &&\
uwsgi-plugin-psgi \
lasso \
lasso-perl \
perl-Devel-StackTrace \
perl-DBD-Pg \
perl-Cache-Cache \
perl-Apache-Session-Browseable \
@ -50,4 +51,5 @@ RUN set -eux &&\
COPY root/ /
USER apache
CMD ["minit"]
ENTRYPOINT ["minit"]
CMD []

5
images/lemonldap-ng/root/etc/minit.d/entrypoint.yml Normal file
View File

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

2
lemonldap-ng.nomad.hcl
View File

@ -65,6 +65,7 @@ job "[[ .instance ]]" {
volumes = [
"secrets/lemonldap-ng.ini:/etc/lemonldap-ng/lemonldap-ng.ini:ro",
"local/init-db.sh:/entrypoint.d/20-initdb.sh:ro",
"local/minit.d/lemonldap-ng.yml:/etc/minit.d/lemonldap-ng.yml:ro"
]
[[ template "common/tmpfs" dict "size" "5000000" "target" "/tmp" ]]
}
@ -79,7 +80,6 @@ job "[[ .instance ]]" {
LLNG_MANAGER_VHOST = [[ (urlParse .llng.manager.public_url).Hostname | toJSON ]]
LLNG_PORTAL_VHOST = [[ (urlParse .llng.portal.public_url).Hostname | toJSON ]]
LLNG_CUSTOM_ASSETS_DIR = "/local/assets"
MINIT_UNIT_DIR = "/local/minit.d"
[[ template "common/proxy_env" $c ]]
}

2
variables.yml
View File

@ -12,7 +12,7 @@ llng:
count: 1
# Docker image to use
image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-7'
image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-8'
# Resource allocation
resources: