diff --git a/jitsi_admin_application_dockerfile b/jitsi_admin_application_dockerfile index 03c7624..ecce55a 100644 --- a/jitsi_admin_application_dockerfile +++ b/jitsi_admin_application_dockerfile @@ -1,8 +1,5 @@ -ARG PHP_IMAGE_VERSION=3.20.6 -FROM erseco/alpine-php-webserver:${PHP_IMAGE_VERSION} - +FROM git.h2-invent.com/public-system-design/alpine-php8-cron-webserver:3.20.8 ARG VERSION -ARG SUPERCRONIC_VERSION=0.2.33 LABEL version="${VERSION}" \ Maintainer="H2 invent GmbH" \ @@ -33,18 +30,6 @@ RUN apk --no-cache add \ RUN echo "Europe/Berlin" > /etc/timezone -RUN wget https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-amd64 -O /supercronic \ - && chmod +x /supercronic - -RUN wget https://git.h2-invent.com/Public-System-Design/Public-Helperscripts/raw/branch/main/distributed_cron.sh -O /distributed_cron.sh \ - && chmod +x /distributed_cron.sh - -RUN mkdir /etc/service/cron \ - && echo "#!/bin/sh" > /etc/service/cron/run \ - && echo "exec 2>&1 /supercronic /var/crontab" >> /etc/service/cron/run \ - && chown -R nobody:nobody /etc/service/cron \ - && chmod -R +x /etc/service/cron - RUN mkdir /etc/service/symfony_messenger \ && echo "#!/bin/sh -e" > /etc/service/symfony_messenger/run \ && echo "exec 2>&1 php -d memory_limit=-1 /var/www/html/bin/console messenger:consume async --memory-limit=512m --env=prod" >> /etc/service/symfony_messenger/run \ @@ -58,14 +43,6 @@ RUN echo "# Docker Cron Jobs" > /var/crontab \ && echo "" >> /var/crontab \ && chown nobody:nobody /var/crontab -RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/02-theme.sh \ - && echo "if [ -d "data/theme" ]" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo "then" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo " cp data/theme/*.json.signed theme/" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo " cp -r data/theme/public/* public/" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo "fi" >> /docker-entrypoint-init.d/02-theme.sh \ - && chmod +x /docker-entrypoint-init.d/02-theme.sh - RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/03-symfony.sh \ && echo "php bin/console cache:clear" >> /docker-entrypoint-init.d/03-symfony.sh \ && echo "php bin/console doc:mig:mig --no-interaction" >> /docker-entrypoint-init.d/03-symfony.sh \