3.7.4-ol-7-r474 release

bitnami/osclass/3/ol-7/Dockerfile

@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras:7-r514
+FROM bitnami/oraclelinux-extras:7-r515
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -12,7 +12,7 @@ RUN bitnami-pkg unpack osclass-3.7.4-22 --checksum 8988c5c3a7b0727770b6db4bb36d6
 COPY rootfs /
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="osclass" \
-    BITNAMI_IMAGE_VERSION="3.7.4-ol-7-r473" \
+    BITNAMI_IMAGE_VERSION="3.7.4-ol-7-r474" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \

bitnami/osclass/3/ol-7/rootfs/apache-init.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Check whether Apache ports must be configured
+if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then
+    export APACHE_SET_HTTP_PORT="yes"
+fi
+if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then
+    export APACHE_SET_HTTPS_PORT="yes"
+fi
+
+# Copy vhosts file
+if [[ "$(ls -A /vhosts 2>/dev/null)" ]]; then
+    info "Found vhost definitions in /vhosts. Copying them to /opt/bitnami/apache/conf/vhosts"
+    cp -r /vhosts/* /opt/bitnami/apache/conf/vhosts
+fi
+
+# Mount certificate files
+if [[ -d "/opt/bitnami/apache/certs" ]]; then
+    warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates"
+    warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..."
+    rm -rf /opt/bitnami/apache/conf/bitnami/certs
+    ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs
+elif [ "$(ls -A /certs 2>/dev/null)" ]; then
+    info "Mounting certificates files from /certs..."
+    rm -rf /opt/bitnami/apache/conf/bitnami/certs
+    ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs
+fi

bitnami/osclass/3/ol-7/rootfs/app-entrypoint.sh

@@ -6,9 +6,11 @@
 print_welcome_page
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
+    . /apache-init.sh
     . /osclass-init.sh
     nami_initialize apache php mysql-client osclass
     info "Starting osclass... "
+    . /post-init.sh
 fi
 
 exec tini -- "$@"

bitnami/osclass/3/ol-7/rootfs/post-init.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. /opt/bitnami/base/functions
+
+if [[ -d /docker-entrypoint-init.d ]] && [[ ! -f /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized ]]; then
+    for f in /docker-entrypoint-init.d/*; do
+        failure=0
+        case "$f" in
+            *.sh)
+                if [[ -x "$f" ]]; then
+                    info "Executing $f"; "$f" || failure=$?
+                else
+                    info "Sourcing $f"; . "$f"
+                fi
+                ;;
+
+            *.php)
+                info "Executing $f with PHP interpreter"
+                php "$f" || failure=$?
+                ;;
+
+            *.sql|*.sql.gz)
+                info "Executing $f"
+                mysql_cmd=( mysql -h "$MARIADB_HOST" -P "$MARIADB_PORT_NUMBER" -u "$MARIADB_ROOT_USER" )
+                if [[ "${ALLOW_EMPTY_PASSWORD:-no}" != "yes" ]]; then
+                    mysql_cmd+=( -p"$MARIADB_ROOT_PASSWORD" )
+                fi
+                if [[ "$f" == *".sql" ]]; then
+                    "${mysql_cmd[@]}" < "$f" || failure=$?
+                elif [[ "$f" == *".sql.gz" ]]; then
+                    gunzip -c "$f" | "${mysql_cmd[@]}" || failure=$?
+                fi
+                ;;
+
+            *)
+                info "Ignoring $f"
+                ;;
+        esac
+        if [[ "$failure" -ne 0 ]]; then
+            error "Failed to execute $f"
+            exit "$failure"
+        fi
+    done
+    info "Custom scripts were executed"
+    touch /bitnami/"$BITNAMI_APP_NAME"/.user_scripts_initialized
+fi

bitnami/osclass/README.md

@@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`3-ol-7`, `3.7.4-ol-7-r473` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/3.7.4-ol-7-r473/3/ol-7/Dockerfile)
+* [`3-ol-7`, `3.7.4-ol-7-r474` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/3.7.4-ol-7-r474/3/ol-7/Dockerfile)
 * [`3-debian-9`, `3.7.4-debian-9-r393`, `3`, `3.7.4`, `3.7.4-r393`, `latest` (3/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/3.7.4-debian-9-r393/3/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).