Browse Source

updated php-fpm from 7.4 to 8.1

bach 8 months ago
parent
commit
61ca5d811c
6 changed files with 19 additions and 15 deletions
  1. 13 11
      Docker/api/Dockerfile
  2. 1 1
      Docker/api/bashrc
  3. 2 1
      Docker/nginx/default.conf
  4. 1 1
      api
  5. 1 1
      app
  6. 1 0
      docker-compose.yml

+ 13 - 11
Docker/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.1-fpm
 
 RUN apt-get update && apt-get install -y \
 		libfreetype6-dev \
@@ -7,17 +7,18 @@ RUN apt-get update && apt-get install -y \
 		libpng-dev \
 		mariadb-client \
     zip \
-    libzip-dev && \
+    libzip-dev
 		# docker-php-ext-install -j$(nproc) iconv && \
-		docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \
+RUN	docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \
 		apt-get install -y imagemagick libmagickwand-dev && \
     pecl install imagick && docker-php-ext-enable imagick && \
 		docker-php-ext-install -j$(nproc) gd && \
 		docker-php-ext-install pdo_mysql zip && \
 		docker-php-ext-install opcache && \
 		docker-php-ext-install bcmath && \
-		apt-get install -y git vim && \
-		pecl install redis-4.3.0 && \
+		apt-get install -y git vim
+
+RUN	pecl install redis-5.3.7 && \
     pecl install xdebug-3.1.3 && \
     docker-php-ext-enable redis xdebug
 
@@ -31,12 +32,13 @@ RUN export COMPOSER_HOME=/usr/local/composer && \
 				-L -o /usr/local/bin/drush && \
 			chmod +x /usr/local/bin/drush
 
-RUN apt-get install -y curl && \
-		curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
-		curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-		echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-		apt-get install -y nodejs yarn
+# TODO depecrated https://github.com/nodesource/distributions
+# RUN apt-get install -y curl && \
+# 		curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
+# 		curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+# 		echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+#     apt-get update && \
+# 		apt-get install -y nodejs yarn
 
 RUN apt-get install -y rsyslog
 COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf

+ 1 - 1
Docker/api/bashrc

@@ -1,4 +1,4 @@
 
-PS1='\e[36m\e[1mPHP-7.3\e[0m:\e[90m\w\e[0m\n$ '
+PS1='\e[36m\e[1mPHP-8.1\e[0m:\e[90m\w\e[0m\n$ '
 bind '"\e[A": history-search-backward'
 bind '"\e[B": history-search-forward'

+ 2 - 1
Docker/nginx/default.conf

@@ -18,7 +18,8 @@ server {
       proxy_set_header X-NginX-Proxy true;
       proxy_set_header X-Ssl on;
       proxy_cache off;
-
+      proxy_buffering off;
+      
       proxy_pass http://app;
       proxy_redirect off;
     }

+ 1 - 1
api

@@ -1 +1 @@
-Subproject commit 268fbb9ed2d8cec196d25c3d93c73eb2073c4793
+Subproject commit d7b9f4d2090e2aee00f853fa0a8d7916442ed07d

+ 1 - 1
app

@@ -1 +1 @@
-Subproject commit 1a7ecfad8f1c63e5020c281ee1cb25e073f18d28
+Subproject commit e080c4ac5eaa9fef9113b1478be230007648a3f9

+ 1 - 0
docker-compose.yml

@@ -42,6 +42,7 @@ services:
     build: ./Docker/api/
     expose:
       - 9000
+      - 9001
     user: ${USER_UID}:${USER_GID}
     volumes:
       - php-user-data:/home/${USER_UNAME}