8.0.0-debian-10-r25 release

bitnami/osclass/8/debian-10/Dockerfile

@@ -13,7 +13,7 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.26-4"
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-7" --checksum 1b827e70d1633dc9c3035458ccf893dbb0d503b5dbfa01109eecb356e1e1a0db
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.32-0" --checksum 4a211faa9436c9747dfc4374cb9e8a7f9b0065dfc58dd4784cef0f5029c2e65e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.26-0" --checksum e30f91e2e21a90772e04b795c2db35d1f0f5d934f4fcb2a1d872e50c32fc8bff
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-3" --checksum cddf51b3cb59d65d5d30e3fe37e99d8d53375ad88f0cc474019a52e6d8b4fc58
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-4" --checksum 9b09b8c13e726569fd846abef20228b2e29de456805994e512f3b47f74cf742d
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "osclass" "8.0.0-0" --checksum ec5855e8cdd6a6b3096b860c8e7db98ae07c105f0af196ee75c41be3f1189536
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
 RUN chmod g+rwX /opt/bitnami
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="osclass" \
-    BITNAMI_IMAGE_VERSION="8.0.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="8.0.0-debian-10-r25" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \

bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -43,9 +43,9 @@
     },
     "render-template": {
         "arch": "amd64",
-        "digest": "cddf51b3cb59d65d5d30e3fe37e99d8d53375ad88f0cc474019a52e6d8b4fc58",
+        "digest": "9b09b8c13e726569fd846abef20228b2e29de456805994e512f3b47f74cf742d",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "1.0.1-3"
+        "version": "1.0.1-4"
     }
 }

bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh

@@ -446,3 +446,19 @@ generate_sha_hash() {
     echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
 }
 
+########################
+# Converts a string to its hexadecimal representation
+# Arguments:
+#   $1 - string
+# Returns:
+#   hexadecimal representation of the string
+#########################
+convert_to_hex() {
+    local -r str=${1:?missing input string}
+    local -i iterator
+    local char
+    for ((iterator=0; iterator<${#str}; iterator++)); do
+        char=${str:iterator:1}
+        printf '%x' "'${char}"
+    done
+}

bitnami/osclass/8/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh

@@ -177,6 +177,8 @@ web_server_reload() {
 #   --document-root - Path to document root directory
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
+#   --apache-additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
@@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() {
 
             # Specific Apache flags
             --apache-additional-configuration \
+            | --apache-additional-http-configuration \
+            | --apache-additional-https-configuration \
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl

@@ -2,5 +2,6 @@
 {{before_vhost_configuration}}
 <VirtualHost {{http_listen_addresses}}>
   {{server_name_configuration}}
+  {{additional_http_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl

@@ -5,5 +5,6 @@
   SSLEngine on
   SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt"
   SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key"
+  {{additional_https_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl

@@ -9,6 +9,7 @@
     {{acl_configuration}}
     {{extra_directory_configuration}}
   </Directory>
+  {{additional_http_configuration}}
   {{additional_configuration}}
   {{htaccess_include}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl

@@ -12,6 +12,7 @@
     {{acl_configuration}}
     {{extra_directory_configuration}}
   </Directory>
+  {{additional_https_configuration}}
   {{additional_configuration}}
   {{htaccess_include}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl

@@ -6,5 +6,6 @@
   {{proxy_http_configuration}}
   ProxyPass / {{proxy_address}}
   ProxyPassReverse / {{proxy_address}}
+  {{additional_http_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl

@@ -9,5 +9,6 @@
   {{proxy_https_configuration}}
   ProxyPass / {{proxy_address}}
   ProxyPassReverse / {{proxy_address}}
+  {{additional_https_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl

@@ -11,5 +11,6 @@ PassengerPreStart http://localhost:{{http_port}}/
     PassengerEnabled on
     {{extra_directory_configuration}}
   </Directory>
+  {{additional_http_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl

@@ -14,5 +14,6 @@ PassengerPreStart https://localhost:{{https_port}}/
     PassengerEnabled on
     {{extra_directory_configuration}}
   </Directory>
+  {{additional_https_configuration}}
   {{additional_configuration}}
 </VirtualHost>

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh

@@ -329,6 +329,8 @@ EOF
 #   --https-port - HTTPS port number
 #   --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined)
 #   --additional-configuration - Additional vhost configuration (no default)
+#   --additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --document-root - Path to document root directory
@@ -354,6 +356,8 @@ ensure_apache_app_configuration_exists() {
     local move_htaccess="yes"
     # Template variables defaults
     export additional_configuration=""
+    export additional_http_configuration=""
+    export additional_https_configuration=""
     export before_vhost_configuration=""
     export allow_override="All"
     export document_root="${BITNAMI_ROOT_DIR}/${app}"
@@ -391,6 +395,8 @@ ensure_apache_app_configuration_exists() {
             | --https-port \
             | --move-htaccess \
             | --additional-configuration \
+            | --additional-http-configuration \
+            | --additional-https-configuration \
             | --before-vhost-configuration \
             | --allow-override \
             | --document-root \
@@ -461,6 +467,8 @@ EOF
     # Indent configurations
     server_name_configuration="$(indent $'\n'"$server_name_configuration" 2)"
     additional_configuration="$(indent $'\n'"$additional_configuration" 2)"
+    additional_http_configuration="$(indent $'\n'"$additional_http_configuration" 2)"
+    additional_https_configuration="$(indent $'\n'"$additional_https_configuration" 2)"
     htaccess_include="$(indent $'\n'"$htaccess_include" 2)"
     acl_configuration=""$(indent $'\n'"$acl_configuration" 4)
     extra_directory_configuration="$(indent $'\n'"$extra_directory_configuration" 4)"

bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh

@@ -478,7 +478,7 @@ mysql_upgrade() {
     else
         mysql_start_bg
         is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)")
-        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}"
+        debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" --force
     fi
 }
 

bitnami/osclass/README.md

@@ -43,7 +43,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/tutorials/understand-rolling-tags-containers/).
 
 
-- [`8`, `8-debian-10`, `8.0.0`, `8.0.0-debian-10-r24` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.0-debian-10-r24/8/debian-10/Dockerfile)
+- [`8`, `8-debian-10`, `8.0.0`, `8.0.0-debian-10-r25` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.0-debian-10-r25/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).