Merge pull request #140 from essentialkaos/develop

Version 1.23.3

.bibop/webkaos-docker.recipe

@@ -0,0 +1,199 @@
+# Bibop recipe for webkaos images
+# See more: https://kaos.sh/bibop
+
+var image_name "essentialkaos/webkaos"
+var repo_tag "REPOSITORY=kaos-testing"
+var build_timeout 300
+var test_port 30000
+var start_delay 3
+
+command "-" "Check if docker is installed"
+  app docker
+
++command "-" "Check if docker daemon works"
+  service-works docker
+
+## Prefetch images ##
+
+command:fetch "docker pull {image_name}:centos7" "Pull CentOS 7 Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:centos7-unprivileged" "Pull CentOS 7 Unprivileged Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol7" "Pull OracleLinux 7 Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol7-unprivileged" "Pull OracleLinux 7 Unprivileged Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol8" "Pull OracleLinux 8 Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol8-unprivileged" "Pull OracleLinux 8 Unprivileged Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol9" "Pull OracleLinux 9 Image"
+  exit 0
+
++command:fetch "docker pull {image_name}:ol9-unprivileged" "Pull OracleLinux 9 Unprivileged Image"
+  exit 0
+
+## Build images ##
+
+command "docker build --build-arg {repo_tag} -f ../.docker/centos7.docker -t {image_name}:centos7 .." "Build CentOS 7 Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/centos7-unprivileged.docker -t {image_name}:centos7-unprivileged .." "Build CentOS 7 Unprivileged Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol7.docker -t {image_name}:ol7 .." "Build OracleLinux 7 Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol7-unprivileged.docker -t {image_name}:ol7-unprivileged .." "Build OracleLinux 7 Unprivileged Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol8.docker -t {image_name}:ol8 .." "Build OracleLinux 8 Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol8-unprivileged.docker -t {image_name}:ol8-unprivileged .." "Build OracleLinux 8 Unprivileged Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol9.docker -t {image_name}:ol9 .." "Build OracleLinux 9 Image"
+  exit 0 {build_timeout}
+
++command "docker build --build-arg {repo_tag} -f ../.docker/ol9-unprivileged.docker -t {image_name}:ol9-unprivileged .." "Build OracleLinux 9 Unprivileged Image"
+  exit 0 {build_timeout}
+
+## CentOS 7 ##
+
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:centos7" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## CentOS 7 Unprivileged ##
+
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:centos7-unprivileged" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 7 ##
+
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol7" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 7 Unprivileged ##
+
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol7-unprivileged" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 8 ##
+
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol8" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 8 Unprivileged ##
+
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol8-unprivileged" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 9 ##
+
+command "docker run --name webkaos -p {test_port}:80 -d {image_name}:ol9" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Oracle Linux 9 Unprivileged ##
+
+command "docker run --name webkaos -p {test_port}:8080 -d {image_name}:ol9-unprivileged" "Start container"
+  exit 0
+
++command "-" "Check if server is accessible"
+  wait {start_delay}
+  http-status GET "http://0.0.0.0:{test_port}" 200
+  http-header GET "http://0.0.0.0:{test_port}" server webkaos
+
++command "docker kill webkaos" "Kill container after test"
+  exit 0
+
++command "docker rm webkaos" "Remove named container after test"
+  exit 0
+
+## Extra commands ##
+
+command:cleanup "docker system prune --all --force" "Clean all images and containers"
+  exit 0

.bibop/webkaos.recipe

@@ -1,4 +1,4 @@
-# Bibop recipe for webkaos (CentOS 7+)
+# Bibop recipe for webkaos (EL7/EL8/EL9)
 # See more: https://kaos.sh/bibop
 
 pkg webkaos webkaos-debug webkaos-nginx webkaos-module-brotli webkaos-module-naxsi

.docker/centos7-unprivileged.docker

@@ -1,6 +1,10 @@
+## REGISTRY CONFIGURATION ######################################################
+
+ARG REGISTRY="docker.io"
+
 ## WEBKAOS UNPRIVILEGED IMAGE ##################################################
 
-FROM essentialkaos/centos:7
+FROM ${REGISTRY}/essentialkaos/centos:7
 
 LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.description="WEBKAOS Image on CentOS 7" \
@@ -10,12 +14,16 @@ LABEL org.opencontainers.image.title="WEBKAOS (Unprivileged)" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
+ARG WEBKAOS_VER=1.23.3
+ARG BROTLI_VER=0.1.5
+ARG REPOSITORY=kaos-release
+
 ARG UID=1001
 ARG GID=1001
 
 # hadolint ignore=DL3031,DL3033
 RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
-    yum -y -q install webkaos webkaos-module-brotli gettext && \
+    yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \
     rm -rf /tmp/* && \

.docker/centos7.docker

@@ -1,6 +1,10 @@
+## REGISTRY CONFIGURATION ######################################################
+
+ARG REGISTRY="docker.io"
+
 ## WEBKAOS IMAGE ###############################################################
 
-FROM essentialkaos/centos:7
+FROM ${REGISTRY}/essentialkaos/centos:7
 
 LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.description="WEBKAOS Image on CentOS 7" \
@@ -10,9 +14,13 @@ LABEL org.opencontainers.image.title="WEBKAOS" \
       org.opencontainers.image.url="https://kaos.sh/webkaos" \
       org.opencontainers.image.source="https://github.com/essentialkaos/webkaos"
 
+ARG WEBKAOS_VER=1.23.3
+ARG BROTLI_VER=0.1.5
+ARG REPOSITORY=kaos-release
+
 # hadolint ignore=DL3031,DL3033
 RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \
-    yum -y -q install webkaos webkaos-module-brotli gettext && \
+    yum -y -q install --enablerepo=${REPOSITORY} webkaos-${WEBKAOS_VER} webkaos-module-brotli-${BROTLI_VER} gettext && \
     yum clean all && \
     rm -rf /var/cache/yum && \
     rm -rf /tmp/* && \

.docker/entrypoint.sh

@@ -4,6 +4,7 @@
 
 if [[ -z "$is_test" ]] ; then
   set -e
+  declare -g error_message
 fi
 
 ################################################################################