Merge pull request #14 from devilbox/release-0.19

Use latest vhost-gen version

.ci/.lib.sh

@@ -5,12 +5,6 @@ set -u
 set -o pipefail
 
 
-###
-### Variables
-###
-CWD="$( dirname "${0}" )"
-
-
 ###
 ### Run
 ###
@@ -45,9 +39,3 @@ function get_random_name() {
 	done
 	echo "${name}"
 }
-
-
-DOCKER_IMAGE="$( grep 'image=".*"' "${CWD}/../Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
-DOCKER_VENDOR="$( grep 'vendor=".*"' "${CWD}/../Dockerfile" | sed 's/^[[:space:]]*//g' | awk -F'"' '{print $2}' )"
-# shellcheck disable=SC2034
-DOCKER_NAME="${DOCKER_VENDOR}/${DOCKER_IMAGE}"

.ci/00.sh

@@ -5,6 +5,7 @@ set -u
 set -o pipefail
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+DOCKER_NAME="${1}"
 
 
 ###
@@ -23,12 +24,6 @@ RAND_NAME="$( get_random_name )"
 run "echo \"hello world\" > ${RAND_DIR}/index.html"
 
 
-###
-### Build container
-###
-run "docker build -t ${DOCKER_NAME} ${CWD}/.."
-
-
 ###
 ### Startup container
 ###
@@ -48,8 +43,8 @@ run "docker run -d --rm \
 run "sleep 5"
 run "docker ps"
 run "docker logs ${RAND_NAME}"
-run "curl localhost"
-run "curl localhost | grep 'hello world'"
+run "curl -sS localhost/index.html"
+run "curl -sS localhost/index.html | grep 'hello world'"
 
 
 ###

.ci/01.sh

@@ -5,6 +5,7 @@ set -u
 set -o pipefail
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+DOCKER_NAME="${1}"
 
 
 ###

.ci/start-ci.sh

@@ -12,27 +12,11 @@ IFS=$'\n'
 
 # Current directory
 CWD="$( dirname "${0}" )"
+IMAGE="${1}"
 
 declare -a TESTS=()
 
 
-###
-### Sanity checks
-###
-
-# Check Dockerfile
-if [ ! -f "${CWD}/../Dockerfile" ]; then
-	echo "Dockerfile not found in: ${CWD}/../Dockerfile."
-	exit 1
-fi
-
-# Check docker Name
-if ! grep -q 'image=".*"' "${CWD}/../Dockerfile" > /dev/null 2>&1; then
-	echo "No 'image' LABEL found"
-	exit
-fi
-
-
 ###
 ### Run tests
 ###
@@ -44,13 +28,13 @@ for f in ${FILES}; do
 done
 
 # Start a single test
-if [ "${#}" -eq "1" ]; then
-	sh -c "${TESTS[${1}]}"
+if [ "${#}" -eq "2" ]; then
+	sh -c "${TESTS[${2}]} ${IMAGE}"
 
 # Run all tests
 else
 	for i in "${TESTS[@]}"; do
-		echo "sh -c ${CWD}/${i}"
-		sh -c "${i}"
+		echo "sh -c ${CWD}/${i} ${IMAGE}"
+		sh -c "${i} ${IMAGE}"
 	done
 fi

.travis.yml

@@ -52,7 +52,8 @@ install:
   - max=100; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce; then break; else i=$((i+1)); fi done
   - docker version
 script:
-  - .ci/start-ci.sh "${TEST}" "${IMAGE}"
+  - make build
+  - make test ARG=${TEST}
 
 
 ###

Dockerfile

@@ -1,11 +1,16 @@
 FROM httpd:2.4
 MAINTAINER "cytopia" <[email protected]>
 
+LABEL \
+	name="cytopia's apache 2.4 image" \
+	image="devilbox/apache-2.4" \
+	vendor="devilbox" \
+	license="MIT"
 
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=0.7
+ARG VHOST_GEN_GIT_REF=0.10
 ARG CERT_GEN_GIT_REF=0.2
 
 ENV BUILD_DEPS \

Makefile

@@ -0,0 +1,21 @@
+image = devilbox/apache-2.4
+
+help:
+	@printf "%s\n" "make build:       Build"
+	@printf "%s\n" "make rebuild:     Rebuild"
+	@printf "%s\n" "make test:        Test"
+
+
+build: pull
+	docker build -t $(image) .
+	cd build; ./gen-readme.sh $(image)
+
+rebuild: pull
+	docker build --no-cache -t $(image) .
+	cd build; ./gen-readme.sh $(image)
+
+test:
+	.ci/start-ci.sh $(image) $(ARG)
+
+pull:
+	docker pull $(shell grep FROM Dockerfile | sed 's/^FROM//g'; done)

README.md

@@ -255,9 +255,9 @@ It allows any of the following combinations:
 ## Version
 
 ```
-Server version: Apache/2.4.33 (Unix)
-Server built:   Apr 30 2018 04:30:01
-Server's Module Magic Number: 20120211:76
+Server version: Apache/2.4.34 (Unix)
+Server built:   Jul 31 2018 16:48:40
+Server's Module Magic Number: 20120211:79
 Server loaded:  APR 1.5.1, APR-UTIL 1.5.4
 Compiled using: APR 1.5.1, APR-UTIL 1.5.4
 Architecture:   64-bit

build/gen-readme.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -eu
+
+
+###
+### Globals
+###
+CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)/.."
+IMAGE="${1}"
+
+###
+### Retrieve information afterwards and Update README.md
+###
+INFO="$( docker run -it --rm --entrypoint=httpd ${IMAGE} -V 2>&1 | tr -d "\r" )"
+
+echo "${INFO}"
+sed -i'' '/##[[:space:]]Version/q' "${CWD}/README.md"
+echo "" >> "${CWD}/README.md"
+echo '```' >> "${CWD}/README.md"
+echo "${INFO}" >> "${CWD}/README.md"
+echo '```' >> "${CWD}/README.md"

data/vhost-gen/main.yml

@@ -90,6 +90,8 @@ vhost:
   # Array of indecies to serve as default files (e.g.: index.php, index.html, etc)
   index:
     - index.php
+    - index.html
+    - index.htm
   # SSL Definition
   ssl:
     dir_crt: /etc/httpd/cert/main