diff --git a/Dockerfile b/Dockerfile index 25dd894..46733d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,17 @@ FROM serversideup/php:8.3-fpm-nginx-alpine USER root -COPY --chown=root:root data/hooks/ /data/hooks +RUN mkdir -p /data/hooks /hooks +COPY --chown=www-data:www-data data/hooks/ /data/hooks VOLUME [ "/hooks" ] +RUN chmod 777 /hooks +COPY --chown=root:root data/etc/ /etc RUN mkdir -p /var/www/html/public/src &&\ install-php-extensions soap USER www-data WORKDIR /var/www/html/public -COPY --chown=www-data:www-data ./data/src/ /var/www/html/public/src -COPY --chown=www-data:www-data ./data/update.php /var/www/html/public -COPY --chown=www-data:www-data ./data/.env.dist /var/www/html/public/.env +COPY --chown=www-data:www-data data/var/www/html/public/src/ /var/www/html/public/src +COPY --chown=www-data:www-data data/var/www/html/public/update.php /var/www/html/public +COPY --chown=www-data:www-data data/var/www/html/public/.env.dist /var/www/html/public/.env RUN sed -i "s|listen \[::\]:8080 default_server;|# \0|" /etc/nginx/site-opts.d/http.conf.template HEALTHCHECK --interval= --timeout=5s --start-period=10s CMD curl --insecure --silent --location --show-error --fail http://localhost:8080$HEALTHCHECK_PATH || exit 1 LABEL org.opencontainers.image.source=https://github.com/niiwiicamo/owndyndns diff --git a/data/etc/s6-overlay/s6-rc.d/provideHooks/up b/data/etc/s6-overlay/s6-rc.d/provideHooks/up index b3f0129..136bea5 100644 --- a/data/etc/s6-overlay/s6-rc.d/provideHooks/up +++ b/data/etc/s6-overlay/s6-rc.d/provideHooks/up @@ -1,2 +1,2 @@ -foreground { echo "copying hooks to volume /hooks for use by certbot..." } -cp /data/hooks/* /hooks/ \ No newline at end of file +foreground { echo "(custom-hook-provider): Copying hooks to volume /hooks for use by certbot..." } +foreground { cp /data/hooks/auth-hook.sh /hooks/ } \ No newline at end of file diff --git a/data/etc/s6-overlay/s6-rc.d/user/provideHooks b/data/etc/s6-overlay/s6-rc.d/user/contents.d/provideHooks similarity index 100% rename from data/etc/s6-overlay/s6-rc.d/user/provideHooks rename to data/etc/s6-overlay/s6-rc.d/user/contents.d/provideHooks diff --git a/data/.env.dist b/data/var/www/html/public/.env.dist similarity index 100% rename from data/.env.dist rename to data/var/www/html/public/.env.dist diff --git a/data/src/Config.php b/data/var/www/html/public/src/Config.php similarity index 100% rename from data/src/Config.php rename to data/var/www/html/public/src/Config.php diff --git a/data/src/Handler.php b/data/var/www/html/public/src/Handler.php similarity index 100% rename from data/src/Handler.php rename to data/var/www/html/public/src/Handler.php diff --git a/data/src/Payload.php b/data/var/www/html/public/src/Payload.php similarity index 100% rename from data/src/Payload.php rename to data/var/www/html/public/src/Payload.php diff --git a/data/src/Soap.php b/data/var/www/html/public/src/Soap.php similarity index 100% rename from data/src/Soap.php rename to data/var/www/html/public/src/Soap.php diff --git a/data/update.php b/data/var/www/html/public/update.php similarity index 100% rename from data/update.php rename to data/var/www/html/public/update.php