From 19334cca74b1420f784343138a48d6364ccd2582 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sun, 17 Nov 2024 13:13:22 +0100 Subject: [PATCH] remove webdir in init scripts --- jitsi_admin_application_dockerfile.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/jitsi_admin_application_dockerfile.txt b/jitsi_admin_application_dockerfile.txt index 00c0e08..0b61277 100644 --- a/jitsi_admin_application_dockerfile.txt +++ b/jitsi_admin_application_dockerfile.txt @@ -52,34 +52,33 @@ RUN mkdir /etc/service/symfony_messenger \ RUN echo "# Docker Cron Jobs" > /var/crontab \ && echo "SHELL=/bin/sh" >> /var/crontab \ && echo "TZ=Europe/Berlin" >> /var/crontab \ - && echo "*/10 * * * * /bin/sh /distributed_cron.sh '${WEBDIR}/data/cron_lock' 'php ${WEBDIR}/bin/console cron:run'" >> /var/crontab \ + && echo "*/10 * * * * /bin/sh /distributed_cron.sh '/var/www/html/data/cron_lock' 'php /var/www/html/bin/console cron:run'" >> /var/crontab \ && echo "" >> /var/crontab \ && chown nobody:nobody /var/crontab RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/02-theme.sh \ - && echo "if [ -d "${WEBDIR}/data/theme" ]" >> /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 ${WEBDIR}/data/theme/*.json.signed ${WEBDIR}/theme/" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo " cp -r ${WEBDIR}/data/theme/public/* ${WEBDIR}/public/" >> /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 ${WEBDIR}/bin/console cache:clear" >> /docker-entrypoint-init.d/03-symfony.sh \ - && echo "php ${WEBDIR}/bin/console doc:mig:mig --no-interaction" >> /docker-entrypoint-init.d/03-symfony.sh \ - && echo "php ${WEBDIR}/bin/console cache:clear" >> /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 \ + && echo "php bin/console cache:clear" >> /docker-entrypoint-init.d/03-symfony.sh \ && chmod +x /docker-entrypoint-init.d/03-symfony.sh RUN wget https://github.com/H2-invent/jitsi-admin/releases/download/${VERSION}/application.zip -O artifact.zip \ - && unzip artifact.zip -d ${WEBDIR} \ + && unzip artifact.zip \ && chown -R nobody public \ && chown -R nobody theme \ && chown -R nobody var \ && chmod -R 700 public \ && chmod -R 700 theme \ - && chmod -R 700 var - -RUN rm artifact.zip \ + && chmod -R 700 var \ + && rm artifact.zip \ && rm -r var/cache USER nobody