Merge pull request #132 from uts-cic/feature/php_7_4-nginx_1_27

Update to PHP 7.4 and Nginx 1.27
uts-cic · Oct 14, 2024 · f835c65 · f835c65
2 parents 5d8b509 + 9e01e93
commit f835c65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm
+FROM php:7.4-fpm
 
 RUN apt-get update && apt-get install -y \
     build-essential \
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-install pdo pgsql pdo_pgsql zip exif pcntl
-RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
+RUN docker-php-ext-configure gd --enable-gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
 RUN docker-php-ext-install gd
 
 RUN pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis

diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
@@ -7,7 +7,7 @@ COPY resources/js ./resources/js
 COPY resources/sass ./resources/sass
 RUN npm run prod
 
-FROM nginx:1.17-alpine
+FROM nginx:1.27-alpine
 WORKDIR /var/www
 ARG network_mode
 COPY docker/nginx/nginx.$network_mode.conf /etc/nginx/conf.d/default.conf