afup#1437 containers docker PHP 7.4

stakovicz · Oct 23, 2024 · 64b9293 · 64b9293
1 parent 3c68ac9
commit 64b9293
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["7.0"]
+        php: ["7.0", "7.4"]
 
     steps:
       - uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
       - name: Setup PHP with tools
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.0'
+          php-version: '7.4'
 
       - name: Get Composer Cache Directory
         id: composer-cache

diff --git a/docker/dockerfiles/apachephp/Dockerfile b/docker/dockerfiles/apachephp/Dockerfile
@@ -1,6 +1,4 @@
-FROM php:7.0-apache
-
-RUN echo 'deb http://archive.debian.org/debian stretch main' > /etc/apt/sources.list
+FROM php:7.4-apache
 
 ARG ENABLE_XDEBUG=false
 
@@ -19,12 +17,12 @@ RUN apt-get update && \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
         libpng-dev \
+        libzip-dev \
         libmcrypt4 \
-        libmcrypt-dev \
         libicu-dev \
         wget && \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
-    docker-php-ext-install pdo_mysql mbstring mysqli zip gd mcrypt intl pcntl && \
+    docker-php-ext-configure gd && \
+    docker-php-ext-install pdo_mysql mysqli zip gd intl pcntl && \
     if [ "$ENABLE_XDEBUG" = "true" ]; then pecl install xdebug-2.6.1 && docker-php-ext-enable xdebug; fi && \
     apt-get autoremove --purge -y && \
     rm -rf /var/lib/apt/lists/*
@@ -38,20 +36,22 @@ RUN a2enmod rewrite && \
     ln -s /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/000-default.conf && \
     echo "date.timezone=Europe/Paris" >> "/usr/local/etc/php/php.ini"
 
+# Install NodeJS
 RUN apt-get update && \
     apt-get install -y \
         build-essential \
         wget \
-        gnupg && \
-    curl -k -sL https://deb.nodesource.com/setup_6.x | bash - && \
-    apt-get install -y nodejs && \
+        gnupg \
+        nodejs && \
     apt-get autoremove --purge -y && \
     rm -rf /var/lib/apt/lists/*
 
+# Install Yarn
 RUN 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 yarn && \
+    apt-get autoremove --purge -y && \
     rm -rf /var/lib/apt/lists/*
 
 # Install local user mapped to the host user uid