Commit 521b5cd3 authored by Mike Terhar's avatar Mike Terhar

Merge branch '1-docker-httpd' into 'master'

Add a dockerfile and thin http-conf

See merge request !1
parents d9470cdc 24baa786
Pipeline #1232 passed with stages
in 20 minutes and 50 seconds