Merge pull request #123 from undecaf/dev-2004

Add Ubuntu 20.04 PHP 7.4/8.0, add PHP 8.0 to 18.04

Author: mattrayner

.circleci/config.yml

@@ -1,7 +1,8 @@
 version: 2
 jobs:
   test:
-    machine: true
+    machine:
+      image: ubuntu-2004:202107-02
     steps:
       - checkout
       - run: |
@@ -10,50 +11,67 @@ jobs:
           make test
 
   deploy:
-    machine: true
+    machine:
+      image: ubuntu-2004:202107-02
     steps:
       - checkout
       - run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASS
           docker-compose -f docker-compose.test.yml -p ci build
-          docker tag ci_web1804-php7:latest mattrayner/lamp:latest
-          docker tag ci_web1804-php7:latest mattrayner/lamp:latest-1804
+          docker tag ci_web2004-php8:latest mattrayner/lamp:latest
+          docker tag ci_web2004-php8:latest mattrayner/lamp:latest-2004
+          docker tag ci_web2004-php8:latest mattrayner/lamp:latest-2004-php8
+          docker tag ci_web2004-php7:latest mattrayner/lamp:latest-2004-php7
+          docker tag ci_web2004-php8:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM
+          docker tag ci_web2004-php8:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004
+          docker tag ci_web2004-php8:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004-php8
+          docker tag ci_web2004-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004-php7
+
+          docker tag ci_web1804-php8:latest mattrayner/lamp:latest-1804
+          docker tag ci_web1804-php8:latest mattrayner/lamp:latest-1804-php8
           docker tag ci_web1804-php7:latest mattrayner/lamp:latest-1804-php7
-          docker tag ci_web1604-php7:latest mattrayner/lamp:latest-1604
-          docker tag ci_web1604-php7:latest mattrayner/lamp:latest-1604-php7
-          docker tag ci_web1804-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM
-          docker tag ci_web1804-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804
+          docker tag ci_web1804-php8:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804
+          docker tag ci_web1804-php8:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804-php8
           docker tag ci_web1804-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804-php7
-          docker tag ci_web1604-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1604
-          docker tag ci_web1604-php7:latest mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1604-php7
+
           docker push mattrayner/lamp:latest
+          docker push mattrayner/lamp:latest-2004
+          docker push mattrayner/lamp:latest-2004-php8
+          docker push mattrayner/lamp:latest-2004-php7
           docker push mattrayner/lamp:latest-1804
+          docker push mattrayner/lamp:latest-1804-php8
           docker push mattrayner/lamp:latest-1804-php7
-          docker push mattrayner/lamp:latest-1604
-          docker push mattrayner/lamp:latest-1604-php7
           docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM
+          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004
+          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004-php7
+          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-2004-php8
           docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804
           docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804-php7
-          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1604
-          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1604-php7
+          docker push mattrayner/lamp:build-$CIRCLE_BUILD_NUM-1804-php8
 
   deploy-tags:
-    machine: true
+    machine:
+      image: ubuntu-2004:202107-02
     steps:
       - checkout
       - run: |
           docker login -u $DOCKER_USER -p $DOCKER_PASS
           docker-compose -f docker-compose.test.yml -p ci build
-          docker tag ci_web1804-php7:latest mattrayner/lamp:$CIRCLE_TAG
-          docker tag ci_web1804-php7:latest mattrayner/lamp:$CIRCLE_TAG-1804
+          docker tag ci_web2004-php8:latest mattrayner/lamp:$CIRCLE_TAG
+          docker tag ci_web2004-php8:latest mattrayner/lamp:$CIRCLE_TAG-2004
+          docker tag ci_web2004-php7:latest mattrayner/lamp:$CIRCLE_TAG-2004-php7
+          docker tag ci_web2004-php8:latest mattrayner/lamp:$CIRCLE_TAG-2004-php8
+          docker tag ci_web1804-php8:latest mattrayner/lamp:$CIRCLE_TAG-1804
           docker tag ci_web1804-php7:latest mattrayner/lamp:$CIRCLE_TAG-1804-php7
-          docker tag ci_web1604-php7:latest mattrayner/lamp:$CIRCLE_TAG-1604
-          docker tag ci_web1604-php7:latest mattrayner/lamp:$CIRCLE_TAG-1604-php7
+          docker tag ci_web1804-php8:latest mattrayner/lamp:$CIRCLE_TAG-1804-php8
+
           docker push mattrayner/lamp:$CIRCLE_TAG
+          docker push mattrayner/lamp:$CIRCLE_TAG-2004
+          docker push mattrayner/lamp:$CIRCLE_TAG-2004-php7
+          docker push mattrayner/lamp:$CIRCLE_TAG-2004-php8
           docker push mattrayner/lamp:$CIRCLE_TAG-1804
           docker push mattrayner/lamp:$CIRCLE_TAG-1804-php7
-          docker push mattrayner/lamp:$CIRCLE_TAG-1604
-          docker push mattrayner/lamp:$CIRCLE_TAG-1604-php7
+          docker push mattrayner/lamp:$CIRCLE_TAG-1804-php8
 
 workflows:
   version: 2

1804/Dockerfile

@@ -1,18 +1,22 @@
 FROM phusion/baseimage:0.11
 MAINTAINER Matthew Rayner <[email protected]>
-ENV REFRESHED_AT 2019-06-11
+ENV REFRESHED_AT 2021-09-08
 
 # based on dgraziotin/lamp
 # MAINTAINER Daniel Graziotin <[email protected]>
+# updated for PHP 8.0 Ferdinand Kasper <[email protected]>
 
 ENV DOCKER_USER_ID 501 
 ENV DOCKER_USER_GID 20
 
 ENV BOOT2DOCKER_ID 1000
 ENV BOOT2DOCKER_GID 50
 
-ENV PHPMYADMIN_VERSION=5.0.2
-ENV SUPERVISOR_VERSION=4.2.0
+ENV PHPMYADMIN_VERSION=5.1.1
+ENV SUPERVISOR_VERSION=4.2.2
+
+ARG PHP_VERSION
+ENV PHP_VERSION=$PHP_VERSION
 
 # Tweaks to give Apache/PHP write permissions to the app
 RUN usermod -u ${BOOT2DOCKER_ID} www-data && \
@@ -28,10 +32,11 @@ RUN add-apt-repository -y ppa:ondrej/php && \
   apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C && \
   apt-get update && \
   apt-get -y upgrade && \
-  apt-get -y install postfix python3-setuptools wget git apache2 php-xdebug libapache2-mod-php mysql-server php-mysql pwgen php-apcu php-gd php-xml php-mbstring php-gettext zip unzip php-zip curl php-curl && \
+  apt-get -y install postfix python3-setuptools wget git apache2 php${PHP_VERSION}-xdebug libapache2-mod-php${PHP_VERSION} mysql-server php${PHP_VERSION}-mysql pwgen php${PHP_VERSION}-apcu php${PHP_VERSION}-gd php${PHP_VERSION}-xml php${PHP_VERSION}-mbstring zip unzip php${PHP_VERSION}-zip curl php${PHP_VERSION}-curl && \
   apt-get -y autoremove && \
+  apt-get -y clean && \
   echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
+  
 # Install supervisor 4
 RUN curl -L https://pypi.io/packages/source/s/supervisor/supervisor-${SUPERVISOR_VERSION}.tar.gz | tar xvz && \
   cd supervisor-${SUPERVISOR_VERSION}/ && \
@@ -45,7 +50,6 @@ RUN chmod 755 /*.sh
 ADD supporting_files/supervisord-apache2.conf /etc/supervisor/conf.d/supervisord-apache2.conf
 ADD supporting_files/supervisord-mysqld.conf /etc/supervisor/conf.d/supervisord-mysqld.conf
 ADD supporting_files/supervisord.conf /etc/supervisor/supervisord.conf
-ADD supporting_files/mysqld_innodb.cnf /etc/mysql/conf.d/mysqld_innodb.cnf
 
 # Remove pre-installed database
 RUN rm -rf /var/lib/mysql
@@ -77,7 +81,6 @@ ADD app/ /app
 #Environment variables to configure php
 ENV PHP_UPLOAD_MAX_FILESIZE 10M
 ENV PHP_POST_MAX_SIZE 10M
-ENV PHP_VERSION 7.4
 
 # Add volumes for the app and MySql
 VOLUME  ["/var/lib/mysql", "/app" ]

1604/Dockerfile renamed to 2004/Dockerfile

@@ -1,36 +1,40 @@
-FROM phusion/baseimage:0.10.2
+FROM phusion/baseimage:focal-1.1.0
 MAINTAINER Matthew Rayner <[email protected]>
-ENV REFRESHED_AT 2019-06-11
+ENV REFRESHED_AT 2021-09-07
 
 # based on dgraziotin/lamp
 # MAINTAINER Daniel Graziotin <[email protected]>
+# updated for Ubuntu 20.04 LTS/PHP 7.4/PHP 8.0 Ferdinand Kasper <[email protected]>
 
 ENV DOCKER_USER_ID 501 
 ENV DOCKER_USER_GID 20
 
 ENV BOOT2DOCKER_ID 1000
 ENV BOOT2DOCKER_GID 50
 
-ENV PHPMYADMIN_VERSION=5.0.2
-ENV SUPERVISOR_VERSION=4.2.0
+ENV PHPMYADMIN_VERSION=5.1.1
+ENV SUPERVISOR_VERSION=4.2.2
+
+ARG PHP_VERSION
+ENV PHP_VERSION=$PHP_VERSION
 
 # Tweaks to give Apache/PHP write permissions to the app
 RUN usermod -u ${BOOT2DOCKER_ID} www-data && \
     usermod -G staff www-data && \
     useradd -r mysql && \
-    usermod -G staff mysql
-
-RUN groupmod -g $(($BOOT2DOCKER_GID + 10000)) $(getent group $BOOT2DOCKER_GID | cut -d: -f1)
-RUN groupmod -g ${BOOT2DOCKER_GID} staff
+    usermod -G staff mysql && \
+    groupmod -g $(($BOOT2DOCKER_GID + 10000)) $(getent group $BOOT2DOCKER_GID | cut -d: -f1) && \
+    groupmod -g ${BOOT2DOCKER_GID} staff
 
 # Install packages
 ENV DEBIAN_FRONTEND noninteractive
-RUN add-apt-repository -y ppa:ondrej/php && \
+RUN LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php && \
   apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C && \
   apt-get update && \
-  apt-get -o Dpkg::Options::="--force-confnew" --force-yes -fuy upgrade && \
-  apt-get -y install postfix python3-setuptools wget git apache2 php-xdebug libapache2-mod-php mysql-server php-mysql pwgen php-apcu php-gd php-xml php-mbstring php-gettext zip unzip php-zip curl php-curl && \
+  apt-get -y upgrade && \
+  apt-get -y install postfix python3-setuptools wget git apache2 php${PHP_VERSION}-xdebug libapache2-mod-php${PHP_VERSION} mysql-server php${PHP_VERSION}-mysql pwgen php${PHP_VERSION}-apcu php${PHP_VERSION}-gd php${PHP_VERSION}-xml php${PHP_VERSION}-mbstring zip unzip php${PHP_VERSION}-zip curl php${PHP_VERSION}-curl && \
   apt-get -y autoremove && \
+  apt-get -y clean && \
   echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
 # Install supervisor 4
@@ -46,7 +50,6 @@ RUN chmod 755 /*.sh
 ADD supporting_files/supervisord-apache2.conf /etc/supervisor/conf.d/supervisord-apache2.conf
 ADD supporting_files/supervisord-mysqld.conf /etc/supervisor/conf.d/supervisord-mysqld.conf
 ADD supporting_files/supervisord.conf /etc/supervisor/supervisord.conf
-ADD supporting_files/mysqld_innodb.cnf /etc/mysql/conf.d/mysqld_innodb.cnf
 
 # Remove pre-installed database
 RUN rm -rf /var/lib/mysql

README.md

@@ -1,7 +1,7 @@
 # ![Docker-LAMP][logo]
-Docker-LAMP is a set of docker images that include the phusion baseimage (16.04 and 18.04 varieties), along with a LAMP stack ([Apache][apache], [MySQL][mysql] and [PHP][php]) all in one handy package.
+Docker-LAMP is a set of docker images that include the phusion baseimage (18.04 and 20.04 varieties), along with a LAMP stack ([Apache][apache], [MySQL][mysql] and [PHP][php]) all in one handy package.
 
-With Ubuntu **18.04** amd **16.04** images on the `latest-1804` and `latest-1604` tags, Docker-LAMP is flexible enough to use with all of your LAMP projects.
+With Ubuntu **20.04** and **18.04** images on the `latest-2004` and `latest-1804` tags, Docker-LAMP is flexible enough to use with all of your LAMP projects.
 
 [![Build Status][shield-build-status]][info-build-status]
 [![Docker Hub][shield-docker-hub]][info-docker-hub]
@@ -46,40 +46,49 @@ As a developer, part of my day to day role is to build LAMP applications. I sear
 
 To complicate things even further I needed an image, or actually two, that would run my applications on both 14.04 and 16.04. Having two entirely separate workflows didn't make any sense to me, and Docker-LAMP was born.
 
-Designed to be a single interface that just 'gets out of your way', and works on 14.04 and 16.04 with php 5 and 7. You can move between all 4 images without changing how you work with Docker.
+Designed to be a single interface that just 'gets out of your way', and works on 18.04 and 20.04 with php 7 and 8. You can move between all images without changing how you work with Docker.
 
 ## Image Versions
-> **NOTE:** [PHP 5.6 is end of life][end-of-life], so the PHP 5 images `mattrayner/lamp:latest-1404-php5` and `mattrayner/lamp:latest-1604-php5` will not receive any updates. Although these images will stay on Docker Hub, we **strongly** recommend updating you applications to PHP7.
+> **NOTE:** [PHP 5.6 is end of life][end-of-life], so the PHP 5 images `mattrayner/lamp:latest-1404-php5` and `mattrayner/lamp:latest-1604-php5` will not receive any updates. Although these images will stay on Docker Hub, we **strongly** recommend updating you applications to PHP 7 or PHP 8.
 
-> **NOTE**: The 14.04 variant of this image is no longer being actively supported for updated
+> **NOTE**: The 14.04 and 16.04 variants of this image are no longer being actively supported or updated.
 
-There are 3 main 'versions' of the docker image. The table below shows the different tags you can use, along with the PHP, MySQL and Apache versions that come with it.
+There are four main 'versions' of the docker image. The table below shows the different tags you can use, along with the PHP, MySQL and Apache versions that come with it.
 
-Component | `latest-1404` | `latest-1604` | `latest-1804`
----|---|---|---
-[Apache][apache] | `2.4.7` | `2.4.18` | `2.4.29`
-[MySQL][mysql] | `5.5.62` | `5.7.30` | `5.7.30`
-[PHP][php] | `7.3.3` | `7.4.6` | `7.4.6`
-[phpMyAdmin][phpmyadmin] | `4.8.5` | `5.0.2` | `5.0.2`
+Component | `latest-1404` | `latest-1604` | `latest-1804-php7` `latest-1804-php8` | `latest-2004-php7` `latest-2004-php8`
+---|---|---|---|---
+[Apache][apache] | `2.4.7` | `2.4.18` | `2.4.29` | `2.4.41`
+[MySQL][mysql] | `5.5.62` | `5.7.30` | `5.7.35` | `8.0.26`
+[PHP][php] | `7.3.3` | `7.4.6` | `7.4.23`/`8.0.10` | `7.4.23`/`8.0.10`
+[phpMyAdmin][phpmyadmin] | `4.8.5` | `5.0.2` | `5.1.1` | `5.1.1`
 
 
 ## Using the image
 ### On the command line
 This is the quickest way
 ```bash
-# Launch a 18.04 based image
-docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-1804
+# Launch a 20.04 based image with PHP 8
+docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-2004-php8
 
-# Launch a 16.04 based image
+# Launch a 20.04 based image with PHP 7
+docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-2004-php7
+
+# Launch a 18.04 based image with PHP 8
+docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-1804-php8
+
+# Launch a 18.04 based image with PHP 7
+docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-1804-php7
+
+# Launch a 16.04 based image with PHP 7
 docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-1604
 
-# Launch a 14.04 based image
+# Launch a 14.04 based image with PHP 5
 docker run -p "80:80" -v ${PWD}/app:/app mattrayner/lamp:latest-1404
 ```
 
 ### With a Dockerfile
 ```docker
-FROM mattrayner/lamp:latest-1804
+FROM mattrayner/lamp:latest-2004-php8
 
 # Your custom commands
 
@@ -189,15 +198,17 @@ git clone https://github.com/mattrayner/docker-lamp.git
 cd docker-lamp
 
 # Build the images
-docker build -t=mattrayner/lamp:latest -f ./1804/Dockerfile .
-docker build -t=mattrayner/lamp:latest-1604 -f ./1604/Dockerfile .
-docker build -t=mattrayner/lamp:latest-1804 -f ./1804/Dockerfile .
+docker build --build-arg PHP_VERSION=8.0 -t=mattrayner/lamp:latest -f ./2004/Dockerfile .
+docker build --build-arg PHP_VERSION=8.0 -t=mattrayner/lamp:latest-2004-php8 -f ./2004/Dockerfile .
+docker build --build-arg PHP_VERSION=7.4 -t=mattrayner/lamp:latest-2004-php7 -f ./2004/Dockerfile .
+docker build --build-arg PHP_VERSION=8.0 -t=mattrayner/lamp:latest-1804-php8 -f ./1804/Dockerfile .
+docker build --build-arg PHP_VERSION=7.4 -t=mattrayner/lamp:latest-1804-php7 -f ./1804/Dockerfile .
 
 # Run the image as a container
-docker run -d -p "3000:80" mattrayner/lamp:latest-1804
+docker run -d -p "3000:80" mattrayner/lamp:latest
 
 # Sleep to allow the container to boot
-sleep 5
+sleep 30
 
 # Curl out the contents of our new container
 curl "http://$(docker-machine ip):3000/"
@@ -218,7 +229,7 @@ So what does this command do?
 First, build that latest version of our docker-compose images.
 
 #### `docker-compose -f docker-compose.test.yml -p ci up -d;`
-Launch our docker containers (`web1804` and `web1604`) in daemon mode.
+Launch our docker containers (`web2004-php8` etc.) in daemon mode.
 
 #### `cd tests && ./test.sh;`
 Change into the test directory and run out tests

docker-compose.test.yml

@@ -1,17 +1,59 @@
-web1804-php7:
-  build: .
-  dockerfile: ./1804/Dockerfile
-  environment:
-    - MYSQL_ADMIN_PASS=password
-  ports:
-    - "3000:80"
-    - "3001:3306"
+version: "2"
 
-web1604-php7:
-  build: .
-  dockerfile: ./1604/Dockerfile
-  environment:
-    - MYSQL_ADMIN_PASS=password
-  ports:
-    - "3010:80"
-    - "3011:3306"
+services:
+
+  web1804-php7:
+    build:
+      context: .
+      dockerfile: ./1804/Dockerfile
+      args:
+        - PHP_VERSION=7.4
+    environment:
+      - MYSQL_ADMIN_PASS=password
+    ports:
+      - "3000:80"
+      - "3001:3306"
+    tmpfs:
+      - /var/lib/mysql
+
+  web1804-php8:
+    build:
+      context: .
+      dockerfile: ./1804/Dockerfile
+      args:
+        - PHP_VERSION=8.0
+    environment:
+      - MYSQL_ADMIN_PASS=password
+    ports:
+      - "3020:80"
+      - "3021:3306"
+    tmpfs:
+      - /var/lib/mysql
+
+  web2004-php7:
+    build:
+      context: .
+      dockerfile: ./2004/Dockerfile
+      args:
+        - PHP_VERSION=7.4
+    environment:
+      - MYSQL_ADMIN_PASS=password
+    ports:
+      - "3030:80"
+      - "3031:3306"
+    tmpfs:
+      - /var/lib/mysql
+
+  web2004-php8:
+    build:
+      context: .
+      dockerfile: ./2004/Dockerfile
+      args:
+        - PHP_VERSION=8.0
+    environment:
+      - MYSQL_ADMIN_PASS=password
+    ports:
+      - "3040:80"
+      - "3041:3306"
+    tmpfs:
+      - /var/lib/mysql