diff --git a/jitsi_admin_application_dockerfile.txt b/jitsi_admin_application_dockerfile.txt index d34222d..99ddf94 100644 --- a/jitsi_admin_application_dockerfile.txt +++ b/jitsi_admin_application_dockerfile.txt @@ -48,27 +48,22 @@ RUN echo "# Docker Cron Jobs" > /etc/crontabs/nobody \ && chown nobody:nobody /etc/crontabs/nobody \ && chmod +x /etc/crontabs/nobody +RUN wget https://github.com/H2-invent/jitsi-admin/releases/download/${VERSION}/application.zip -O artifact.zip \ + && unzip artifact.zip -d ${WEBDIR} \ + && chown -R nobody ${WEBDIR}/public \ + && chown -R nobody ${WEBDIR}/var \ + RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/02-theme.sh \ - && echo "if [ -d "${WEBDIR}/data/theme" ]; then" >> /docker-entrypoint-init.d/02-theme.sh \ + && echo "if [ -d "${WEBDIR}/data/theme" ]" >> /docker-entrypoint-init.d/02-theme.sh \ + && echo "then" >> /docker-entrypoint-init.d/02-theme.sh \ && echo " cp ${WEBDIR}/data/theme/theme/*.json.signed* ${WEBSIR}/theme/" >> /docker-entrypoint-init.d/02-theme.sh \ && echo " cp -r ${WEBDIR}/data/theme/public/* ${WEBSIR}/public/" >> /docker-entrypoint-init.d/02-theme.sh \ - && echo "fi" >> /docker-entrypoint-init.d/03-theme.sh \ - && chmod +x /docker-entrypoint-init.d/* + && echo "fi" >> /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 - -RUN wget https://github.com/H2-invent/jitsi-admin/releases/download/${VERSION}/application.zip -O artifact.zip \ - && unzip artifact.zip -d ${WEBDIR} \ - && chown -R nobody ${WEBDIR}/public \ - && chown -R nobody ${WEBDIR}/var \RUN echo "#!/bin/sh" > /docker-entrypoint-init.d/03-theme.sh \ - && echo "if [ -d "${WEBDIR}/data/theme" ]" >> /docker-entrypoint-init.d/03-theme.sh \ - && echo "then" >> /docker-entrypoint-init.d/03-theme.sh \ - && echo " cp -r ${WEBDIR}/data/theme/theme/*.json.signed* ${WEBSIR}/theme/" >> /docker-entrypoint-init.d/03-theme.sh \ - && echo " cp -r ${WEBDIR}/data/theme/public/* ${WEBSIR}/public/" >> /docker-entrypoint-init.d/03-theme.sh \ - && echo "fi" >> /docker-entrypoint-init.d/03-theme.sh \ && chmod +x /docker-entrypoint-init.d/* && chmod -R 700 ${WEBDIR}/public \