Merge branch 'development' into h-node

2 files changed, 0 insertions, 49 deletions

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 544ac17..0000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,23 +0,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:
-      - 80:80
-      - 3306:3306
-    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:
-    image: mattrayner/lamp:latest-1804
-    ports:
-      - 80:80
-      - 3306:3306
-    volumes:
-      - "../h-source:/app"
-      - "../mysql:/var/lib/mysql"
diff --git a/docker/readme-lamp.sh b/docker/readme-lamp.sh
deleted file mode 100755
index d5aa572..0000000
--- a/docker/readme-lamp.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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