1.7.8-0-debian-10-r32 release

bitnami/prestashop/1.7/debian-10/Dockerfile

@@ -11,7 +11,7 @@ COPY prebuildfs /
 RUN install_packages acl ca-certificates curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-4" --checksum ad0e16b36d93d6410f1266bf45f1f853038c9c8bb04523dd3e408b426ceb6a18
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-0" --checksum 71010c86332e4ad0993bc875d103bb916184f1f42884a9098db65c969553c34a
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.4.21-2" --checksum 0ad1e1862ae23bd9aa0513d4cbe37ef6533f4a25ed140a6ae402f3e38bc6fef7
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.4.22-0" --checksum 0f28660749aa65bc54937c37602dc9464064510ebd0a068b2a3e3be17ffab6e5
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.25-0" --checksum 94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-1" --checksum 00722b62c7561929e039877a6e445a4bb782c340890c0a090fdae3c9e1960161
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "prestashop" "1.7.8-0-0" --checksum aafda8c3385072f1235ed26630228977814a3a8cb6502a1a0001d9fa234fdcb9
@@ -20,8 +20,8 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/prestashop/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="prestashop" \
-    BITNAMI_IMAGE_VERSION="1.7.8-0-debian-10-r31" \
+    BITNAMI_IMAGE_VERSION="1.7.8-0-debian-10-r32" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \

bitnami/prestashop/1.7/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -22,10 +22,10 @@
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "0ad1e1862ae23bd9aa0513d4cbe37ef6533f4a25ed140a6ae402f3e38bc6fef7",
+        "digest": "0f28660749aa65bc54937c37602dc9464064510ebd0a068b2a3e3be17ffab6e5",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "10.4.21-2"
+        "version": "10.4.22-0"
     },
     "php": {
         "arch": "amd64",

bitnami/prestashop/1.7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh

@@ -178,13 +178,13 @@ web_server_reload() {
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional 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')
+#   --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
 #   --apache-proxy-address - Address where to proxy requests
 #   --apache-proxy-configuration - Extra configuration for the proxy
 #   --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost
 #   --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost
-#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
+#   --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined)
 # NGINX-specific flags:
 #   --nginx-additional-configuration - Additional server block configuration (no default)
 #   --nginx-external-configuration - Configuration external to server block (no default)

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

@@ -1,3 +1,4 @@
+{{http_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{http_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{https_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{https_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{http_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{http_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{https_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{https_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{http_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{http_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{https_listen_configuration}}
 {{before_vhost_configuration}}
 <VirtualHost {{https_listen_addresses}}>
   {{server_name_configuration}}

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

@@ -1,3 +1,4 @@
+{{http_listen_configuration}}
 {{before_vhost_configuration}}
 PassengerPreStart http://localhost:{{http_port}}/
 <VirtualHost {{http_listen_addresses}}>

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

@@ -1,3 +1,4 @@
+{{https_listen_configuration}}
 {{before_vhost_configuration}}
 PassengerPreStart https://localhost:{{https_port}}/
 <VirtualHost {{https_listen_addresses}}>

bitnami/prestashop/1.7/debian-10/rootfs/opt/bitnami/scripts/libapache.sh

@@ -327,10 +327,10 @@ EOF
 #   --disable-https - Whether to render the app's HTTPS virtual host with a .disabled prefix
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
-#   --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
+#   --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)
 #   --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')
+#   --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
 #   --extra-directory-configuration - Extra configuration for the document root directory
 #   --proxy-address - Address where to proxy requests
@@ -358,8 +358,10 @@ ensure_apache_app_configuration_exists() {
     export allow_override="All"
     export document_root="${BITNAMI_ROOT_DIR}/${app}"
     export extra_directory_configuration=""
-    export http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
+    export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
-    export https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"
+    export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"
+    export http_port="$default_http_port"
+    export https_port="$default_https_port"
     export proxy_address=""
     export proxy_configuration=""
     export proxy_http_configuration=""
@@ -409,6 +411,11 @@ ensure_apache_app_configuration_exists() {
         esac
         shift
     done
+    # Construct listen ports configuration (only to add when using non-standard ports)
+    export http_listen_configuration=""
+    export https_listen_configuration=""
+    [[ "$http_port" != "$default_http_port" ]] && http_listen_configuration="Listen ${http_port}"
+    [[ "$https_port" != "$default_https_port" ]] && https_listen_configuration="Listen ${https_port}"
     # Construct host string in the format of "host1:port1[ host2:port2[ ...]]"
     export http_listen_addresses=""
     export https_listen_addresses=""
@@ -426,10 +433,10 @@ ensure_apache_app_configuration_exists() {
     if [[ "${#server_aliases[@]}" -gt 0 ]]; then
         server_name_configuration+=$'\n'"ServerAlias ${server_aliases[*]}"
     fi
-    # App .htaccess support
+    # App .htaccess support (only when type is not defined)
     export htaccess_include
-    is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
@@ -455,6 +462,7 @@ EOF
     server_name_configuration="$(indent $'\n'"$server_name_configuration" 2)"
     additional_configuration="$(indent $'\n'"$additional_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)"
     proxy_configuration="$(indent $'\n'"$proxy_configuration" 2)"
     proxy_http_configuration="$(indent $'\n'"$proxy_http_configuration" 2)"
@@ -519,10 +527,10 @@ ensure_apache_app_configuration_not_exists() {
 # Flags:
 #   --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty)
 #   --allow-remote-connections - Whether to allow remote connections or to require local connections
-#   --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup
+#   --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined)
 #   --prefix - URL prefix from where it will be accessible (i.e. /myapp)
 #   --additional-configuration - Additional vhost configuration (no default)
-#   --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no')
+#   --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
 #   --extra-directory-configuration - Extra configuration for the document root directory
 # Returns:
@@ -565,10 +573,10 @@ ensure_apache_prefix_configuration_exists() {
         esac
         shift
     done
-    # App .htaccess support
+    # App .htaccess support (only when type is not defined)
     export htaccess_include
-    is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
@@ -643,8 +651,10 @@ apache_update_app_configuration() {
     local enable_https="no"
     local disable_http="no"
     local disable_https="no"
-    local http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
+    export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
-    local https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"
+    export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"
+    export http_port="$default_http_port"
+    export https_port="$default_https_port"
     local var_name
     # Validate arguments
     local var_name
@@ -721,7 +731,8 @@ apache_update_app_configuration() {
     if [[ -e "$http_vhost" ]]; then
         if is_file_writable "$http_vhost"; then
             update_common_vhost_config "$http_vhost"
-            # Update vhost-specific config (listen addresses)
+            # Update vhost-specific config (listen port and addresses)
+            replace_in_file "$http_vhost" "^Listen .*" "Listen ${http_port}"
             replace_in_file "$http_vhost" "^<VirtualHost\s.*>$" "<VirtualHost ${http_listen_addresses}>"
         else
             warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file."
@@ -730,7 +741,8 @@ apache_update_app_configuration() {
     if [[ -e "$https_vhost" ]]; then
         if is_file_writable "$https_vhost"; then
             update_common_vhost_config "$https_vhost"
-            # Update vhost-specific config (listen addresses)
+            # Update vhost-specific config (listen port and addresses)
+            replace_in_file "$https_vhost" "^Listen .*" "Listen ${https_port}"
             replace_in_file "$https_vhost" "^<VirtualHost\s.*>$" "<VirtualHost ${https_listen_addresses}>"
         else
             warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file."

bitnami/prestashop/README.md

@@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`1.7`, `1.7-debian-10`, `1.7.8-0`, `1.7.8-0-debian-10-r31`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-0-debian-10-r31/1.7/debian-10/Dockerfile)
+* [`1.7`, `1.7-debian-10`, `1.7.8-0`, `1.7.8-0-debian-10-r32`, `latest` (1.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-prestashop/blob/1.7.8-0-debian-10-r32/1.7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/prestashop GitHub repo](https://github.com/bitnami/bitnami-docker-prestashop).