Explorar el Código

updated php to 8.1 & drupal to 9.5

bach hace 3 meses
padre
commit
b7d3ef9f33
Se han modificado 3 ficheros con 10 adiciones y 26 borrados
  1. 6 16
      Docker/php/Dockerfile
  2. 3 9
      Makefile
  3. 1 1
      app

+ 6 - 16
Docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.1.20-fpm
 
 RUN apt-get update && apt-get install -y \
 		libfreetype6-dev \
@@ -22,25 +22,15 @@ RUN apt-get install -y git vim
 RUN pecl install redis-5.3.3 && \
     docker-php-ext-enable redis
 
-RUN pecl install xdebug-3.1.6 && \
+RUN pecl install xdebug-3.2.1 && \
     docker-php-ext-enable xdebug
 
 RUN export COMPOSER_HOME=/usr/local/composer && \
 	    curl -sS https://getcomposer.org/installer \
-				| php -- --install-dir=/usr/local/bin --filename=composer && \
-			curl https://drupalconsole.com/installer \
-				-L -o /usr/local/bin/drupal && \
-			chmod +x /usr/local/bin/drupal && \
-			curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \
-				-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
+				| php -- --install-dir=/usr/local/bin --filename=composer
+			# curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \
+			# 	-L -o /usr/local/bin/drush && \
+			# chmod +x /usr/local/bin/drush
 
 RUN apt-get install -y rsyslog
 COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf

+ 3 - 9
Makefile

@@ -34,16 +34,10 @@ down:
 		docker-compose down
 
 exec_php:
-		docker exec -it popsucoloque_php_1 bash
+		docker exec -it popsucoloque-php-1 bash
 
 exec_npm:
-		docker exec -it popsucoloque_npm_1 sh
+		docker exec -it popsucoloque-npm-1 sh
 
 exec_mysql:
-		docker exec -it popsucoloque_mysql_1 bash
-
-exec_solr:
-		docker exec -it popsucoloque_solr-new_1 bash
-
-phplegacy:
-		docker exec -it popsucoloque_php-legacy_1 bash
+		docker exec -it popsucoloque-mysql-1 bash

+ 1 - 1
app

@@ -1 +1 @@
-Subproject commit a2a15c7ee627957d5eb4bcce54449ff91869f176
+Subproject commit 33f8f97e1a433b2e28848eee6db43ec1e0297c85