From e5d8adfe0cda67173cae706708e0b4e7a67f5713 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Mon, 6 Sep 2021 10:27:36 +1000 Subject: Adding lamp-php7 docker command. - Tested locally. The website up and running. - Also updated the readme script to run either php5 or php7. --- docker/docker-compose.yml | 20 +++++++++++++++----- docker/lamp-php7.Dockerfile | 3 +++ docker/readme-lamp.sh | 26 ++++++++++++++++++++++++++ docker/readme-php5.sh | 16 ---------------- 4 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 docker/lamp-php7.Dockerfile create mode 100755 docker/readme-lamp.sh delete mode 100755 docker/readme-php5.sh (limited to 'docker') diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9a7aa44..dcc4ed1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,9 +1,7 @@ -# Image for LAMP based on Dockerfile in https://github.com/jakejarvis/docker-lamp-php5 -# WARNING: Not suitable for production environments, only for testing legacy php5 application. -# (Docker image supplementary files licenced under Apache 2.0) - -version: "3" services: + # Image for LAMP based on Dockerfile in https://github.com/jakejarvis/docker-lamp-php5 + # WARNING: Not suitable for production environments, only for testing legacy php5 application. + # (Docker image supplementary files licenced under Apache 2.0) lamp-php5: image: docker.io/jakejarvis/lamp-php5:latest ports: @@ -12,3 +10,15 @@ services: volumes: - "../h-source:/app" - "../mysql:/var/lib/mysql" + # Image for LAMP based on https://github.com/mattrayner/docker-lamp + # (Docker image licenced under Apache 2.0) + lamp-php7: + build: + dockerfile: lamp-php7.Dockerfile + context: . + ports: + - 8001:80 + - 3306:3306 + volumes: + - "../h-source:/app" + - "../mysql:/var/lib/mysql" diff --git a/docker/lamp-php7.Dockerfile b/docker/lamp-php7.Dockerfile new file mode 100644 index 0000000..4dc7b50 --- /dev/null +++ b/docker/lamp-php7.Dockerfile @@ -0,0 +1,3 @@ +FROM mattrayner/lamp:latest-1804 + +CMD ["/run.sh"] \ No newline at end of file diff --git a/docker/readme-lamp.sh b/docker/readme-lamp.sh new file mode 100755 index 0000000..c73cbfa --- /dev/null +++ b/docker/readme-lamp.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Spin up a docker lamp image. +# +# Usage: +# ./readme-lamp.sh [php-version] +# +# php-version: 5 or 7 (default) +# +# INSTRUCTIONS for testing with docker-lamp-php{5,7}: +# +# After the docker container spins up, +# the mysql password will be displayed. +# - MySQL on port 3306 +# - Apache on port 80 +# +# Don't forget to create the database: +# mysql -uadmin -pXXX -h127.0.0.1 -e "create database hnode;" +# and populate the schema/initial data with: +# mysql -uadmin -pXXX -h127.0.0.1 hnode < ../h-source/tables.sql + +if [ -z "$1"]; then + docker-compose up --build lamp-php7 +else + docker-compose up --build lamp-php"$1" +fi diff --git a/docker/readme-php5.sh b/docker/readme-php5.sh deleted file mode 100755 index 7ec58b1..0000000 --- a/docker/readme-php5.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# -# INSTRUCTIONS for testing with docker-lamp-php5: -# -# After the docker container spins up, -# the mysql password will be displayed. -# - MySQL on port 3306 -# - Apache on port 80 -# -# Don't forget to create the database: -# mysql -uadmin -pXXX -h127.0.0.1 -e "create database hnode;" -# and populate the schema/initial data with: -# mysql -uadmin -pXXX -h127.0.0.1 hnode < ../h-source/tables.sql - -docker-compose up --build lamp-php5 - -- cgit v1.2.3