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

Release 0.49b (beta)
devilbox · Dec 25, 2022 · 36c416a · 36c416a
2 parents 587e927 + 135847c
commit 36c416a
Show file tree

Hide file tree

Showing 108 changed files with 6,846 additions and 2,264 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/.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 nginx:stable-alpine
 MAINTAINER "cytopia" <cytopia@everythingcli.org>
 
@@ -11,9 +12,9 @@ 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 VHOST_GEN_GIT_REF=1.0.8
+ARG WATCHERD_GIT_REF=v1.0.7
+ARG CERT_GEN_GIT_REF=0.10
 
 ENV BUILD_DEPS \
 	make \
@@ -28,15 +29,6 @@ ENV RUN_DEPS \
 	supervisor
 
 
-###
-### Runtime arguments
-###
-ENV MY_USER=nginx
-ENV MY_GROUP=nginx
-ENV HTTPD_START="/usr/sbin/nginx"
-ENV HTTPD_RELOAD="nginx -s stop"
-
-
 ###
 ### Install required packages
 ###
@@ -60,14 +52,25 @@ 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
 	&& apk del \
 		${BUILD_DEPS}
 
 
+###
+### Runtime arguments
+###
+ENV MY_USER=nginx
+ENV MY_GROUP=nginx
+ENV HTTPD_START="/usr/sbin/nginx"
+ENV HTTPD_RELOAD="nginx -s stop"
+ENV HTTPD_VERSION="nginx -V 2>&1 | head -1 | awk '{print \$3}'"
+ENV VHOSTGEN_HTTPD_SERVER="nginx"
+
+
 ###
 ### Create directories
 ###
@@ -78,6 +81,7 @@ 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
@@ -90,14 +94,22 @@ RUN set -eux \
 	&& ln -sf /usr/bin/python3 /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/nginx/nginx.conf /etc/nginx/nginx.conf
-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.debian b/Dockerfiles/Dockerfile.debian
@@ -1,3 +1,4 @@
+# vi: ft=dockerfile
 FROM nginx:stable
 MAINTAINER "cytopia" <cytopia@everythingcli.org>
 
@@ -11,9 +12,9 @@ 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 VHOST_GEN_GIT_REF=1.0.8
+ARG WATCHERD_GIT_REF=v1.0.7
+ARG CERT_GEN_GIT_REF=0.10
 
 ENV BUILD_DEPS \
 	make \
@@ -25,15 +26,6 @@ ENV RUN_DEPS \
 	supervisor
 
 
-###
-### Runtime arguments
-###
-ENV MY_USER=nginx
-ENV MY_GROUP=nginx
-ENV HTTPD_START="/usr/sbin/nginx"
-ENV HTTPD_RELOAD="nginx -s stop"
-
-
 ###
 ### Install required packages
 ###
@@ -58,7 +50,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
@@ -67,6 +59,17 @@ RUN set -eux \
 	&& rm -rf /var/lib/apt/lists/*
 
 
+###
+### Runtime arguments
+###
+ENV MY_USER=nginx
+ENV MY_GROUP=nginx
+ENV HTTPD_START="/usr/sbin/nginx"
+ENV HTTPD_RELOAD="nginx -s stop"
+ENV HTTPD_VERSION="nginx -V 2>&1 | head -1 | awk '{print \$3}'"
+ENV VHOSTGEN_HTTPD_SERVER="nginx"
+
+
 ###
 ### Create directories
 ###
@@ -77,6 +80,7 @@ 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
@@ -89,14 +93,22 @@ RUN set -eux \
 	&& ln -sf /usr/bin/python3 /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/nginx/nginx.conf /etc/nginx/nginx.conf
-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