merge develop into master

Author: gegere

.circleci/config.yml

@@ -65,14 +65,14 @@ jobs:
       - run:
           name: LIVE Build Tests
           command: |
-            docker exec apache_hg-web_1 /bin/bash /opt/tests/build_tests.sh
+            docker exec apache_web_1 /bin/bash /opt/tests/build_tests.sh
 
       - run:
           name: Container Logs
           command: |
             mkdir -p /tmp/container-build
-            docker logs apache_hg-web_1 > /tmp/container-build/log_output-LIVE_Apache.txt
-            docker logs apache_hg-db_1 > /tmp/container-build/log_output-LIVE_MySQL.txt
+            docker logs apache_web_1 > /tmp/container-build/log_output-LIVE_Apache.txt
+            docker logs apache_db_1 > /tmp/container-build/log_output-LIVE_MySQL.txt
 
 
 

Dockerfile

@@ -46,7 +46,7 @@ COPY ./app /opt/app
 COPY ./tests /opt/tests
 
 # Unit tests run via build_tests.sh
-RUN tar xf /opt/tests/2.1.6.tar.gz -C /opt/tests/
+RUN tar xf /opt/tests/shunit2-2.1.7.tar.gz -C /opt/tests/
 
 # SUPERVISOR
 RUN chmod -R 755 /opt/* \

Makefile

@@ -1,11 +1,24 @@
+#!/bin/sh
+
 # Build a container via the command "make build"
 # By Jason Gegere <jason@htmlgraphic.com>
 
+SHELL = /bin/sh
+
+include .env # .env file needs to created for this to work properly
+
 TAG 		= 1.8.1
 CONTAINER 	= apache
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(CONTAINER)
-include .env # .env file needs to created for this to work properly
+NODE_ENV=$(shell grep NODE_ENVIRONMENT .env | cut -d '=' -f 2-)
+
+
+ifeq ($(NODE_ENV),dev)
+	COMPOSE_FILE = docker-compose.local.yml
+else
+	COMPOSE_FILE = docker-compose.yml
+endif
 
 
 all:: help
@@ -29,7 +42,7 @@ env:
 	@[ ! -f .env ] && echo "	.env file does not exist, copy env template \n" && cp .env.example .env || echo "	env file exists \n"
 	@echo "The following environment varibles exist:"
 	@echo $(shell sed 's/=.*//' .env)
-	@echo "\n"
+	@echo ''
 
 
 build:
@@ -44,18 +57,22 @@ push:
 	docker push $(IMAGE_NAME):$(TAG)
 
 run:
-	@echo 'Checking... initial run structure'
-	@if [ ! -d "~/SITES/docker" ]; then \
-		echo "	Creating project folders" && sudo mkdir -p ~/SITES && sudo mkdir -p ~/SITES/docker; fi
+	@echo 'Setting environment varibles...'
 	@make env
-	@echo "Upon initial setup run the following on the MySQL system, this will setup a GLOBAL admin:"
-	@echo ""
+	@echo "Checking... initial directory structure \n"
+	@if [ $(NODE_ENV) == 'dev' ]; then \
+		if [ ! -d "~/SITES/docker" ]; then \
+			echo "	Creating project folders \n" && sudo mkdir -p ~/SITES && sudo mkdir -p ~/SITES/docker; fi \
+	fi
+	@echo 'Run the following on the MySQL system, this will setup a GLOBAL admin:'
+	@echo ''
 	@echo "	docker exec -it apache_db /bin/bash \n \
 		mysql -p$(MYSQL_ROOT_PASSWORD) \n \
 		GRANT ALL PRIVILEGES ON * . * TO '$(MYSQL_USER)'@'%' with grant option; \n"
 
 	@echo "	THE PASSWORD FOR $(MYSQL_USER) IS $(MYSQL_PASSWORD); \n"
-	docker-compose -f docker-compose.local.yml up -d
+	docker-compose -f $(COMPOSE_FILE) up -d
+
 
 start: run
 

README.md

@@ -7,9 +7,11 @@
 [![Beerpay](https://beerpay.io/htmlgraphic/Apache/badge.svg?style=beer)](https://beerpay.io/htmlgraphic/Apache) [![Beerpay](https://beerpay.io/htmlgraphic/Apache/make-wish.svg?style=flat)](https://beerpay.io/htmlgraphic/Apache)
 
 
-This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP 7.3, PHP Composer, linked [MySQL 5.7.26](https://hub.docker.com/_/mysql) instance and a data container volume.
+This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP 7.3, PHP Composer, linked [MySQL 5.7.28](https://hub.docker.com/_/mysql) instance and a data container volume.
 
-In this repo you will find a number of complete Dockerfile builds used in **dev** or **production** environments. Listed below is an explanation of each file. [Ask a question!](https://github.com/htmlgraphic/Apache/issues/new)
+Using containers offer a huge advantage when developing locally or in prodcution. Use this containers for development and deployment. Changing `NODE_ENVIRONMENT` within to `.env` to `dev` or `production` will offer a dynamic environment.
+
+Listed below is an explanation of each file. [Ask a question!](https://github.com/htmlgraphic/Apache/issues/new)
 
 #### Dependencies
 - Docker [Download](https://hub.docker.com/search/?type=edition&offering=community)
@@ -31,8 +33,8 @@ Apache                       # → Root of Docker Build
 │   ├── sample.conf          # → located within `/data/apache2/sites-enabled` duplicate / modify to host others domains
 │   └── supervisord          # → Supervisor is a client / server system which monitors and controls a number of processes on UNIX-like operating systems
 ├── .env.example             # → Rename file to `.env` for local environment variables used within build
-├── .circleci/               # → CircleCI 2.0
-│   └── config.yml           # → CircleCI Config
+├── .circleci/
+│   └── config.yml           # → CircleCI 2.0 Config
 ├── docker-compose.local.yml # → Dev build 
 ├── docker-compose.yml       # → Production build
 ├── Dockerfile               # → Uses a basefile build to help speed up the docker container build process

app/index.php

@@ -5,8 +5,17 @@
 	<!-- Latest compiled and minified CSS -->
 	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 <style>
-body {font-family: 'Open Sans', sans-serif; font-weight: 300; font-size: 14px; text-align: center; padding: 50px; }
-div img#logo {margin: 0 auto 40px auto; float: none;}
+body {
+	font-family: 'Open Sans', sans-serif; 
+	font-weight: 300; 
+	font-size: 14px; 
+	text-align: center; 
+	padding: 50px; 
+}
+div img#logo {
+	margin: 0 auto 40px auto; 
+	float: none;
+}
 .e {
 	background-color: #ccf;
 	width: 300px;
@@ -85,6 +94,26 @@
 			<td class="text-right">SMTP_HOST</td>
 			<td class="text-left"><?= getenv('SMTP_HOST'); ?></td>
 		</tr>
+		<tr>
+			<td class="text-right">max_execution_time</td>
+			<td class="text-left"><?= ini_get('max_execution_time'); ?></td>
+		</tr>
+		<tr>
+			<td class="text-right">memory_limit</td>
+			<td class="text-left"><?= ini_get('memory_limit'); ?></td>
+		</tr>
+		<tr>
+			<td class="text-right">upload_max_filesize</td>
+			<td class="text-left"><?= ini_get('upload_max_filesize'); ?></td>
+		</tr>
+		<tr>
+			<td class="text-right">post_max_size</td>
+			<td class="text-left"><?= ini_get('post_max_size'); ?></td>
+		</tr>
+		<tr>
+			<td class="text-right">max_input_time</td>
+			<td class="text-left"><?= ini_get('max_input_time'); ?></td>
+		</tr>
 		</tbody>
 		</table>
 	</div>

app/php_extensions.php

@@ -0,0 +1,38 @@
+<?php
+# Ensure that chars show in browser correctly.
+header('Content-Type: text/plain; charset=utf-8');
+
+// The following modules, should exist in the build
+$mods_check = explode(',', 'apache2handler,apcu,calendar,ctype,curl,date,dom,exif,fileinfo,filter,ftp,gd,gettext,hash,iconv,imagick,json,libxml,mbstring,mcrypt,mysqli,mysqlnd,openssl,pcre,pdo,pdo_mysql,phar,posix,readline,reflection,session,shmop,simplexml,sockets,spl,standard,sysvmsg,sysvsem,sysvshm,tokenizer,wddx,xml,xmlreader,xmlwriter,xsl,zend opcache,zip,zlib');
+
+// Sort alphabetically.
+sort($mods_check);
+
+// Get regular (non-Zend) extensions.
+$mods = get_loaded_extensions();
+
+// 'zend_extensions' param only introduced in PHP 5.2.4,
+// setting the param returns NULL in PHP 5.1.
+$zend_mods = get_loaded_extensions(true);
+if ($zend_mods) {
+    $mods = array_merge($mods, $zend_mods);
+}
+$mods = array_map('strtolower', $mods);
+// Remove duplicates.
+$mods = array_unique($mods);
+
+print 'Extensions:    ' ."\n\n";
+
+#
+# Output modules table.
+#
+foreach($mods_check as $mod) {
+    # Search for Apache module, does it exist
+    printf('%-16s ', $mod);
+    if(in_array($mod, $mods)) {
+        echo '|    ✓    ';
+    } else {
+        echo '|         ';
+    }
+    echo "\n";
+}

app/run.sh

@@ -67,7 +67,7 @@ fi
 
 #####
 #
-#  Edit files on the instance for improved preformance
+#  Edit files on the container, improving preformance
 #  Modify php.ini for each build
 #  Check for proper environment
 #  Route mail to SMTP queuing servers
@@ -88,11 +88,18 @@ if [ ! -f /etc/php/7.3/apache2/build ]; then
 	sed -i 's|;session.save_path = "/var/lib/php5"|session.save_path = "/tmp"|g' /etc/php/7.3/apache2/php.ini
 	sed -i 's|session.gc_probability = 0|session.gc_probability = 1|g' /etc/php/7.3/apache2/php.ini
 
-	# Increase memory & upload limitations
+	# Update Apache / PHP Config
 	sed -i 's|max_execution_time = 30|max_execution_time = 300|g' /etc/php/7.3/apache2/php.ini
 	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.3/apache2/php.ini
 	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.3/apache2/php.ini
 	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.3/apache2/php.ini
+	sed -i 's|max_input_time = 60|max_input_time = 300|g' /etc/php/7.3/apache2/php.ini
+	
+	# Update CLI Config
+	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.3/cli/php.ini
+	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.3/cli/php.ini
+	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.3/cli/php.ini
+
 
 	# Add build file to remove duplicate script execution
 	echo 1 > /etc/php/7.3/apache2/build

app/supervisord

@@ -29,6 +29,3 @@ stderr_logfile=/var/log/supervisor/%(program_name)s-stderr.log
 command=/opt/app/postfix.sh
 autostart=true
 autorestart=true
-
-[program:sshd]
-command=/usr/sbin/sshd -D

docker-compose.local.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.3'
 services:
   web:
     image: 'htmlgraphic/apache:latest' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
@@ -13,8 +13,13 @@ services:
       - '443:443'
     env_file:
       - .env
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "10"
   db:
-    image: 'mysql:5.7.25'
+    image: 'mysql:5.7.28'
     container_name: apache_db
     volumes:
       - 'db-data:/var/lib/mysql'

docker-compose.yml

@@ -1,27 +1,32 @@
-version: '3'
-hg-web:
-  image: 'htmlgraphic/apache:envoyer' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
-  ports:
-    - "80:80"
-    - "443:443"
-  environment:
-    - NODE_ENVIRONMENT=production
-  env_file:
-    - .env
-  links:
-    - "hg-db:mysql"
-hg-db:
-  image: 'mysql:5.7.25'
-  environment:
-    - MYSQL_DATABASE=htmlgraphic
-    - MYSQL_PASSWORD=new_password
-    - MYSQL_ROOT_PASSWORD=new_passwordac
-    - MYSQL_USER=admin
-  expose:
-    - "3306"
-  volumes_from:
-    - db-data
-db-data:
-  image: 'busybox:latest'
-  volumes:
-    - "/var/lib/mysql"
+version: '3.3'
+services:
+  web:
+    image: 'htmlgraphic/apache:envoyer' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
+    ports:
+      - "80:80"
+      - "443:443"
+    env_file:
+      - .env
+    volumes:
+      - '/var/data:/data'
+      - '/etc/letsencrypt:/etc/letsencrypt'
+    links:
+      - "db:mysql"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "10"
+  db:
+    image: 'mysql:5.7.28'
+    environment:
+      - MYSQL_DATABASE=htmlgraphic
+      - MYSQL_PASSWORD=new_password
+      - MYSQL_ROOT_PASSWORD=new_passwordac
+      - MYSQL_USER=admin
+    expose:
+      - "3306"
+    volumes:
+      - 'db-data:/var/lib/mysql'
+volumes:
+  db-data: