diff --git a/Containerfile.fpm b/Containerfile.fpm index 7bed831..c126c19 100644 --- a/Containerfile.fpm +++ b/Containerfile.fpm @@ -53,8 +53,9 @@ COPY --from=builder /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d RUN set -xe;\ apt-get update &&\ + apt-get upgrade -y &&\ apt-get install --no-install-recommends -y libzip4 libpq5 libmagickwand-6.q16-6 libxpm4 libwebp6 &&\ - apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init &&\ + apt-get install --no-install-recommends -y optipng pngquant jpegoptim gifsicle ffmpeg locales gosu dumb-init rsync &&\ apt-get clean all &&\ rm -rf /var/lib/apt/lists/* @@ -65,7 +66,7 @@ RUN set -xe;\ sed -i 's/^upload_max_filesize.*/upload_max_filesize = 100M/g' "$PHP_INI_DIR"/php.ini* &&\ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" WORKDIR /var/www -VOLUME /var/www/storage /var/www/bootstrap +VOLUME /var/www/storage /var/www/bootstrap /public ENTRYPOINT /entrypoint.sh LABEL build.date=$DATE diff --git a/entrypoint.fpm.sh b/entrypoint.fpm.sh index 6cf9677..8bcdfff 100755 --- a/entrypoint.fpm.sh +++ b/entrypoint.fpm.sh @@ -1,11 +1,6 @@ #!/usr/bin/env bash set -xeo pipefail -if [ ! -z $FORCE_HTTPS ] -then - sed -i 's#