From 39e32762ae93db61520020622e7bf5a479a6de57 Mon Sep 17 00:00:00 2001 From: Jessica Smith Date: Sat, 18 Nov 2023 15:29:15 +0000 Subject: [PATCH] Fix development containers --- docker/develop/Dockerfile.nginx | 1 - docker/develop/Dockerfile.php-fpm | 2 +- docker/production/Dockerfile.nginx | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/develop/Dockerfile.nginx b/docker/develop/Dockerfile.nginx index a5c457a..8030762 100644 --- a/docker/develop/Dockerfile.nginx +++ b/docker/develop/Dockerfile.nginx @@ -1,5 +1,4 @@ FROM ghcr.io/mintopia/php-docker-nginx:latest LABEL maintainer="jess@mintopia.net" -RUN rm /etc/nginx/conf.d/default.conf COPY docker/default.conf /etc/nginx/templates/conf.d/default.conf.template diff --git a/docker/develop/Dockerfile.php-fpm b/docker/develop/Dockerfile.php-fpm index 9a484b5..40d2f26 100644 --- a/docker/develop/Dockerfile.php-fpm +++ b/docker/develop/Dockerfile.php-fpm @@ -9,6 +9,6 @@ RUN apk update \ && docker-php-ext-enable xdebug \ && rm -rf /tmp/pear \ && apk del --no-cache ${PHPIZE_DEPS} \ - && rm -vrf /tmp/pear /var/cache/apk/* \ + && rm -vrf /tmp/pear /var/cache/apk/* USER 1000 diff --git a/docker/production/Dockerfile.nginx b/docker/production/Dockerfile.nginx index adfac4b..49ee7eb 100644 --- a/docker/production/Dockerfile.nginx +++ b/docker/production/Dockerfile.nginx @@ -18,5 +18,4 @@ LABEL maintainer="jess@mintopia.net" COPY --from=build --chown=1000:1000 /app/ /var/www -RUN rm /etc/nginx/conf.d/default.conf COPY docker/default.conf /etc/nginx/templates/conf.d/default.conf.template