diff --git a/Docker/api/Dockerfile b/Docker/api/Dockerfile index 969efdf..481736e 100644 --- a/Docker/api/Dockerfile +++ b/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 diff --git a/Docker/api/bashrc b/Docker/api/bashrc index 70f55f9..6c45676 100644 --- a/Docker/api/bashrc +++ b/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' diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf index aeb57e8..091abfa 100644 --- a/Docker/nginx/default.conf +++ b/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; } diff --git a/api b/api index 268fbb9..d7b9f4d 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 268fbb9ed2d8cec196d25c3d93c73eb2073c4793 +Subproject commit d7b9f4d2090e2aee00f853fa0a8d7916442ed07d diff --git a/app b/app index 1a7ecfa..e080c4a 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 1a7ecfad8f1c63e5020c281ee1cb25e073f18d28 +Subproject commit e080c4ac5eaa9fef9113b1478be230007648a3f9 diff --git a/docker-compose.yml b/docker-compose.yml index ac0cca5..fe683a0 100644 --- a/docker-compose.yml +++ b/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}