diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/docker-compose.yml | 7 | ||||
| -rwxr-xr-x | docker/readme-lamp.sh | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index dcc4ed1..544ac17 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,3 +1,4 @@ +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. @@ -13,11 +14,9 @@ services: # 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: . + image: mattrayner/lamp:latest-1804 ports: - - 8001:80 + - 80:80 - 3306:3306 volumes: - "../h-source:/app" diff --git a/docker/readme-lamp.sh b/docker/readme-lamp.sh index c73cbfa..d5aa572 100755 --- a/docker/readme-lamp.sh +++ b/docker/readme-lamp.sh @@ -19,7 +19,7 @@ # and populate the schema/initial data with: # mysql -uadmin -pXXX -h127.0.0.1 hnode < ../h-source/tables.sql -if [ -z "$1"]; then +if [ -z "$1" ]; then docker-compose up --build lamp-php7 else docker-compose up --build lamp-php"$1" |