diff --git a/.devcontainer/cli/Dockerfile b/.devcontainer/cli/Dockerfile index 908acef..0317097 100644 --- a/.devcontainer/cli/Dockerfile +++ b/.devcontainer/cli/Dockerfile @@ -1,5 +1,5 @@ # From official php image. -FROM php:8.3-cli-alpine +FROM php:8.4-cli-alpine # Create a user group and account under id 1000. RUN addgroup -g 1000 -S user && adduser -u 1000 -D user -G user # Install quality-of-life packages. @@ -16,14 +16,14 @@ ENV PUPPETEER_DOCKER=1 RUN mkdir -p /usr/src/php/ext/imagick RUN chmod 777 /usr/src/php/ext/imagick -RUN curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1 +RUN curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/3.8.0.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1 # Install PHP extensions RUN docker-php-ext-install imagick # Composer uses its php binary, but we want it to use the container's one -RUN rm -f /usr/bin/php83 -RUN ln -s /usr/local/bin/php /usr/bin/php83 +RUN rm -f /usr/bin/php84 +RUN ln -s /usr/local/bin/php /usr/bin/php84 # Install postgres pdo driver. # RUN apk add --no-cache postgresql-dev && docker-php-ext-install pdo_pgsql # Install redis driver. diff --git a/.devcontainer/fpm/Dockerfile b/.devcontainer/fpm/Dockerfile index b9770e3..8c585c8 100644 --- a/.devcontainer/fpm/Dockerfile +++ b/.devcontainer/fpm/Dockerfile @@ -1,5 +1,5 @@ # From official php image. -FROM php:8.3-fpm-alpine +FROM php:8.4-fpm-alpine RUN addgroup -g 1000 -S user && adduser -u 1000 -D user -G user # Install postgres pdo driver. # RUN apk add --no-cache postgresql-dev && docker-php-ext-install pdo_pgsql @@ -21,10 +21,10 @@ ENV PUPPETEER_DOCKER=1 RUN mkdir -p /usr/src/php/ext/imagick RUN chmod 777 /usr/src/php/ext/imagick -RUN curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1 +RUN curl -fsSL https://github.com/Imagick/imagick/archive/refs/tags/3.8.0.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1 # Install PHP extensions RUN docker-php-ext-install imagick -RUN rm -f /usr/bin/php83 -RUN ln -s /usr/local/bin/php /usr/bin/php83 +RUN rm -f /usr/bin/php84 +RUN ln -s /usr/local/bin/php /usr/bin/php84 diff --git a/Dockerfile b/Dockerfile index 6a9931d..57a919f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################## # Base Image ######################## -FROM bnussbau/serversideup-php:8.3-fpm-nginx-alpine-imagick-chromium AS base +FROM bnussbau/serversideup-php:8.4-fpm-nginx-alpine-imagick-chromium AS base LABEL org.opencontainers.image.source=https://github.com/usetrmnl/byos_laravel LABEL org.opencontainers.image.description="TRMNL BYOS Laravel"