Merge pull request #53 from devilbox/release-0.49b

Release 0.49b (beta)
devilbox · Dec 25, 2022 · cc585a0 · cc585a0
2 parents 1125c1f + ac28cce
commit cc585a0
Show file tree

Hide file tree

Showing 111 changed files with 7,086 additions and 2,186 deletions.
diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml
@@ -0,0 +1,57 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: docker-compose
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/docker-compose.yml'
+      - 'Dockerfiles/**'
+      - 'examples/**/docker-compose.yml'
+      - 'examples/**/integration-test.sh'
+      - 'examples/integration-test.sh'
+
+
+jobs:
+  docker-compose:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: 'docker-compose: main-vhost Static Files'
+        run: |
+          cd ./examples/default-vhost__static-files/
+          ./integration-test.sh
+
+      - name: 'docker-compose: main-vhost PHP-FPM'
+        run: |
+          cd ./examples/default-vhost__php-fpm/
+          ./integration-test.sh
+
+      - name: 'docker-compose: main-vhost PHP-FPM (SSL)'
+        run: |
+          cd ./examples/default-vhost__php-fpm__ssl/
+          ./integration-test.sh
+
+      - name: 'docker-compose: main-vhost Reverse Proxy (NodeJS)'
+        run: |
+          cd ./examples/default-vhost__reverse-proxy__node/
+          ./integration-test.sh
+
+      - name: 'docker-compose: mass-vhost PHP-FPM (SSL)'
+        run: |
+          cd ./examples/mass-vhost__php-fpm__ssl/
+          ./integration-test.sh
+
+      - name: 'docker-compose: mass-vhost Reverse Proxy (SSL)'
+        run: |
+          cd ./examples/mass-vhost__reverse-proxy__ssl/
+          ./integration-test.sh
diff --git a/.github/workflows/params.yml b/.github/workflows/params.yml
@@ -15,13 +15,13 @@ env:
       {
         "NAME":    "Apache",
         "VERSION": ["2.2"],
-        "FLAVOUR": ["latest", "debian"],
+        "FLAVOUR": ["debian"],
         "ARCH":    ["linux/amd64", "linux/386", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
       },
       {
         "NAME":    "Apache",
         "VERSION": ["2.2"],
-        "FLAVOUR": ["alpine"],
+        "FLAVOUR": ["latest", "alpine"],
         "ARCH":    ["linux/amd64"]
       }
     ]

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 Makefile.docker
 Makefile.lint
+devilbox-ca.crt
+devilbox-ca.key
+devilbox-ca.srl
diff --git a/Dockerfiles/Dockerfile.alpine b/Dockerfiles/Dockerfile.alpine
@@ -1,3 +1,4 @@
+# vi: ft=dockerfile
 FROM alpine:3.5 as builder
 
 RUN set -eux \
@@ -17,10 +18,10 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=1.0.3
-ARG WATCHERD_GIT_REF=v1.0.2
-ARG CERT_GEN_GIT_REF=0.7
-ARG ARCH
+ARG VHOST_GEN_GIT_REF=1.0.8
+ARG WATCHERD_GIT_REF=v1.0.7
+ARG CERT_GEN_GIT_REF=0.10
+ARG ARCH=linux/amd64
 
 ENV BUILD_DEPS \
 	autoconf \
@@ -39,14 +40,6 @@ ENV RUN_DEPS \
 	tzdata
 
 
-###
-### Runtime arguments
-###
-ENV MY_USER=daemon
-ENV MY_GROUP=daemon
-ENV HTTPD_START="httpd-foreground"
-ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
-
 ###
 ### Install required packages
 ###
@@ -87,7 +80,7 @@ RUN set -eux \
 	&& chmod +x /usr/bin/cert-gen \
 	\
 	# Install watcherd
-	&& wget --no-check-certificate -O /usr/bin/watcherd https://raw.githubusercontent.com/devilbox/watcherd/${WATCHERD_GIT_REF}/watcherd \
+	&& wget --no-check-certificate -O /usr/bin/watcherd https://raw.githubusercontent.com/devilbox/watcherd/${WATCHERD_GIT_REF}/bin/watcherd \
 	&& chmod +x /usr/bin/watcherd \
 	\
 	# Clean-up
@@ -125,6 +118,17 @@ RUN set -eux \
 	) >> /usr/local/apache2/conf/httpd.conf
 
 
+###
+### Runtime arguments
+###
+ENV MY_USER=daemon
+ENV MY_GROUP=daemon
+ENV HTTPD_START="httpd-foreground"
+ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
+ENV HTTPD_VERSION="httpd -V 2>&1 | head -1 | awk '{print \$3}'"
+ENV VHOSTGEN_HTTPD_SERVER="apache22"
+
+
 ###
 ### Create directories
 ###
@@ -133,21 +137,38 @@ RUN set -eux \
 	&& mkdir -p /etc/httpd/conf.d \
 	&& mkdir -p /etc/httpd/vhost.d \
 	&& mkdir -p /var/www/default/htdocs \
+	&& mkdir -p /var/log/httpd \
 	&& mkdir -p /shared/httpd \
 	&& chmod 0775 /shared/httpd \
 	&& chown ${MY_USER}:${MY_GROUP} /shared/httpd
 
 
+###
+### Symlink Python3 to Python
+###
+RUN set -eux \
+	&& ln -sf /usr/bin/python2 /usr/bin/python
+
+
+###
+### Set timezone
+###
+RUN set -eux \
+	&& if [ -f /etc/localtime ]; then rm /etc/localtime; fi \
+	&& ln -s /usr/share/zoneinfo/UTC /etc/localtime
+
+
 ###
 ### Copy files
 ###
-COPY ./data/vhost-gen/main.yml /etc/vhost-gen/main.yml
-COPY ./data/vhost-gen/mass.yml /etc/vhost-gen/mass.yml
+COPY ./data/vhost-gen/templates-main /etc/vhost-gen/templates-main
 COPY ./data/create-vhost.sh /usr/local/bin/create-vhost.sh
+
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 
 
+
 ###
 ### Backporting from Alpine 3.5
 ###

diff --git a/Dockerfiles/Dockerfile.debian b/Dockerfiles/Dockerfile.debian
@@ -1,3 +1,4 @@
+# vi: ft=dockerfile
 FROM httpd:2.2
 MAINTAINER "cytopia" <[email protected]>
 
@@ -11,10 +12,10 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=1.0.3
-ARG WATCHERD_GIT_REF=v1.0.2
-ARG CERT_GEN_GIT_REF=0.7
-ARG ARCH
+ARG VHOST_GEN_GIT_REF=1.0.8
+ARG WATCHERD_GIT_REF=v1.0.7
+ARG CERT_GEN_GIT_REF=0.10
+ARG ARCH=linux/amd64
 
 ENV BUILD_DEPS \
 	autoconf \
@@ -28,14 +29,6 @@ ENV RUN_DEPS \
 	supervisor
 
 
-###
-### Runtime arguments
-###
-ENV MY_USER=daemon
-ENV MY_GROUP=daemon
-ENV HTTPD_START="httpd-foreground"
-ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
-
 ###
 ### Install required packages
 ###
@@ -82,7 +75,7 @@ RUN set -eux \
 	&& chmod +x /usr/bin/cert-gen \
 	\
 	# Install watcherd
-	&& wget --no-check-certificate -O /usr/bin/watcherd https://raw.githubusercontent.com/devilbox/watcherd/${WATCHERD_GIT_REF}/watcherd \
+	&& wget --no-check-certificate -O /usr/bin/watcherd https://raw.githubusercontent.com/devilbox/watcherd/${WATCHERD_GIT_REF}/bin/watcherd \
 	&& chmod +x /usr/bin/watcherd \
 	\
 	# Clean-up
@@ -121,6 +114,17 @@ RUN set -eux \
 	) >> /usr/local/apache2/conf/httpd.conf
 
 
+###
+### Runtime arguments
+###
+ENV MY_USER=daemon
+ENV MY_GROUP=daemon
+ENV HTTPD_START="httpd-foreground"
+ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
+ENV HTTPD_VERSION="httpd -V 2>&1 | head -1 | awk '{print \$3}'"
+ENV VHOSTGEN_HTTPD_SERVER="apache22"
+
+
 ###
 ### Create directories
 ###
@@ -129,17 +133,33 @@ RUN set -eux \
 	&& mkdir -p /etc/httpd/conf.d \
 	&& mkdir -p /etc/httpd/vhost.d \
 	&& mkdir -p /var/www/default/htdocs \
+	&& mkdir -p /var/log/httpd \
 	&& mkdir -p /shared/httpd \
 	&& chmod 0775 /shared/httpd \
 	&& chown ${MY_USER}:${MY_GROUP} /shared/httpd
 
 
+###
+### Symlink Python3 to Python
+###
+RUN set -eux \
+	&& ln -sf /usr/bin/python2 /usr/bin/python
+
+
+###
+### Set timezone
+###
+RUN set -eux \
+	&& if [ -f /etc/localtime ]; then rm /etc/localtime; fi \
+	&& ln -s /usr/share/zoneinfo/UTC /etc/localtime
+
+
 ###
 ### Copy files
 ###
-COPY ./data/vhost-gen/main.yml /etc/vhost-gen/main.yml
-COPY ./data/vhost-gen/mass.yml /etc/vhost-gen/mass.yml
+COPY ./data/vhost-gen/templates-main /etc/vhost-gen/templates-main
 COPY ./data/create-vhost.sh /usr/local/bin/create-vhost.sh
+
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 

diff --git a/Dockerfiles/Dockerfile.latest b/Dockerfiles/Dockerfile.latest
@@ -1 +1 @@
-Dockerfile.debian
+Dockerfile.alpine