Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 6742e9f9 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

chore: add a dedicated custom entrypoint for slim instance

parent a7aeb475

custom_entrypoint-slim.sh

0 → 100755
+12 −0
Original line number Diff line number Diff line 
#!/bin/sh



echo "Murena entrypoint"



# syslog-ng

if [ -n ${SYSLOG_HOST} ]; then

  sed -i "s|\${SYSLOG_HOST}|${SYSLOG_HOST:-127.0.0.1}|g" /etc/syslog-ng/syslog-ng.conf

  syslog-ng --no-caps

  echo "syslog-ng started."

fi



/entrypoint.sh "$@"

slim.Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ARG SENTRY_URL="https://github.com/ChristophWurst/nextcloud_sentry/releases/down 
ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v29.0.18/eCloud-v29.0.18.tar.gz"

ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz"



COPY custom_entrypoint.sh /

COPY custom_entrypoint-slim.sh /

COPY hooks.d/post-installation/ /docker-entrypoint-hooks.d/post-installation/



RUN rm -rf ${BASE_DIR}/core/skeleton/* ${BASE_DIR}/themes/example \
@@ -48,7 +48,7 @@ RUN curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/ 


COPY config/syslog-ng/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf



ENTRYPOINT ["/custom_entrypoint.sh"]

ENTRYPOINT ["/custom_entrypoint-slim.sh"]

CMD ["php-fpm"]

# only for dev purpose

STOPSIGNAL SIGKILL