diff --git a/FrankenPHP.Alpine.Dockerfile b/FrankenPHP.Alpine.Dockerfile index e71e477..22cec5e 100644 --- a/FrankenPHP.Alpine.Dockerfile +++ b/FrankenPHP.Alpine.Dockerfile @@ -121,8 +121,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -132,8 +132,8 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/sessions \ @@ -143,15 +143,15 @@ RUN mkdir -p \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini # FrankenPHP embedded PHP configuration -COPY --link --chown=${USER}:${USER} deployment/php.ini /lib/php.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini /lib/php.ini RUN composer install \ --classmap-authoritative \ diff --git a/FrankenPHP.Dockerfile b/FrankenPHP.Dockerfile index cc52abf..0edba9b 100644 --- a/FrankenPHP.Dockerfile +++ b/FrankenPHP.Dockerfile @@ -125,8 +125,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -136,23 +136,23 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/{sessions,views,cache,testing} \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini # FrankenPHP embedded PHP configuration -COPY --link --chown=${USER}:${USER} deployment/php.ini /lib/php.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini /lib/php.ini RUN composer install \ --classmap-authoritative \ diff --git a/RoadRunner.Alpine.Dockerfile b/RoadRunner.Alpine.Dockerfile index 488eef5..bd956ce 100644 --- a/RoadRunner.Alpine.Dockerfile +++ b/RoadRunner.Alpine.Dockerfile @@ -117,8 +117,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -128,8 +128,8 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/sessions \ @@ -139,13 +139,13 @@ RUN mkdir -p \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/RoadRunner/supervisord.roadrunner.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini -COPY --link --chown=${USER}:${USER} deployment/octane/RoadRunner/.rr.prod.yaml ./.rr.yaml -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/RoadRunner/supervisord.roadrunner.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/RoadRunner/.rr.prod.yaml ./.rr.yaml +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck RUN composer install \ --classmap-authoritative \ diff --git a/RoadRunner.Dockerfile b/RoadRunner.Dockerfile index aa6411e..a90758b 100644 --- a/RoadRunner.Dockerfile +++ b/RoadRunner.Dockerfile @@ -122,8 +122,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -133,21 +133,21 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/{sessions,views,cache,testing} \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/RoadRunner/supervisord.roadrunner.conf /etc/supervisor/conf.d -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini -COPY --link --chown=${USER}:${USER} deployment/octane/RoadRunner/.rr.prod.yaml ./.rr.yaml -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/RoadRunner/supervisord.roadrunner.conf /etc/supervisor/conf.d +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/RoadRunner/.rr.prod.yaml ./.rr.yaml +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck RUN composer install \ --classmap-authoritative \ diff --git a/Swoole.Alpine.Dockerfile b/Swoole.Alpine.Dockerfile index 018cc80..00dceac 100644 --- a/Swoole.Alpine.Dockerfile +++ b/Swoole.Alpine.Dockerfile @@ -118,8 +118,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -129,8 +129,8 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/sessions \ @@ -140,12 +140,12 @@ RUN mkdir -p \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/Swoole/supervisord.swoole.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/Swoole/supervisord.swoole.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck RUN composer install \ --classmap-authoritative \ diff --git a/Swoole.Dockerfile b/Swoole.Dockerfile index 621eef7..d0e0444 100644 --- a/Swoole.Dockerfile +++ b/Swoole.Dockerfile @@ -123,8 +123,8 @@ RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini USER ${USER} -COPY --link --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer -COPY --link --chown=${USER}:${USER} composer.json composer.lock ./ +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=vendor /usr/bin/composer /usr/bin/composer +COPY --link --chown=${WWWUSER}:${WWWUSER} composer.json composer.lock ./ RUN composer install \ --no-dev \ @@ -134,20 +134,20 @@ RUN composer install \ --no-scripts \ --audit -COPY --link --chown=${USER}:${USER} . . -COPY --link --chown=${USER}:${USER} --from=build ${ROOT}/public public +COPY --link --chown=${WWWUSER}:${WWWUSER} . . +COPY --link --chown=${WWWUSER}:${WWWUSER} --from=build ${ROOT}/public public RUN mkdir -p \ storage/framework/{sessions,views,cache,testing} \ storage/logs \ bootstrap/cache && chmod -R a+rw storage -COPY --link --chown=${USER}:${USER} deployment/supervisord.conf /etc/supervisor/ -COPY --link --chown=${USER}:${USER} deployment/octane/Swoole/supervisord.swoole.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ -COPY --link --chown=${USER}:${USER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini -COPY --link --chown=${USER}:${USER} deployment/start-container /usr/local/bin/start-container -COPY --link --chown=${USER}:${USER} deployment/healthcheck /usr/local/bin/healthcheck +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.conf /etc/supervisor/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/octane/Swoole/supervisord.swoole.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/supervisord.*.conf /etc/supervisor/conf.d/ +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/start-container /usr/local/bin/start-container +COPY --link --chown=${WWWUSER}:${WWWUSER} deployment/healthcheck /usr/local/bin/healthcheck RUN composer install \ --classmap-authoritative \