Merge pull request #22 from NHSLeadership/s6-upgrade-3

quick fix
NHSLeadership · Apr 18, 2024 · e60a94a · e60a94a
2 parents f0d16e3 + 4c17989
commit e60a94a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/phpfpm/Dockerfile b/phpfpm/Dockerfile
@@ -86,13 +86,13 @@ RUN apt-get update \
   && rm -rf /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf \
   && rm -rf /etc/php/${PHP_VERSION}/fpm/conf.d/20-atatus.ini \
   && rm -rf /etc/php/${PHP_VERSION}/cli/conf.d/20-atatus.ini \
-  && ln -s /nhsla/etc/php.ini /etc/php/${PHP_VERSION}/fpm/php.ini \
-  && ln -s /nhsla/etc/www.conf /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf \
-  && ln -s /nhsla/etc/atatus.ini /etc/php/${PHP_VERSION}/fpm/conf.d/20-atatus.ini \
+  && ln -s /nhsla/setup/php.ini /etc/php/${PHP_VERSION}/fpm/php.ini \
+  && ln -s /nhsla/setup/www.conf /etc/php/${PHP_VERSION}/fpm/pool.d/www.conf \
+  && ln -s /nhsla/setup/atatus.ini /etc/php/${PHP_VERSION}/fpm/conf.d/20-atatus.ini \
   && ln -s /etc/php/fpm /etc/php/${PHP_VERSION}/fpm \
   && ln -s /etc/php/cli /etc/php/${PHP_VERSION}/cli \
   && rm -rf /etc/ssmtp/ssmtp.conf \
-  && ln -s /nhsla/etc/ssmtp.conf /etc/ssmtp/ssmtp.conf \
+  && ln -s /nhsla/setup/ssmtp.conf /etc/ssmtp/ssmtp.conf \
   && curl --proto "=https" --tlsv1.3 -fsSLO "$SUPERCRONIC_URL" \
   && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
   && chmod +x "$SUPERCRONIC" \