Skip to content

Commit

Permalink
afup#1437 containers docker PHP 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
stakovicz committed Feb 4, 2024
1 parent 41d9fa6 commit b04aa31
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.0"]
php: ["7.0", "7.4"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions docker/dockerfiles/apachephp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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/*
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions docker/dockerfiles/planete/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

# Install required php extensions for afup website and other management package
RUN apt-get update && \
Expand Down

0 comments on commit b04aa31

Please sign in to comment.