2.4.3-debian-10-r68 release
This commit is contained in:
Bitnami Bot
parent
e6beb846c8
commit
58a71cefbd
|
|
@ -21,8 +21,8 @@ RUN chmod g+rwX /opt/bitnami
|
|||
RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
|
||||
|
||||
COPY rootfs /
|
||||
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/magento/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
|
||||
|
|
@ -31,7 +31,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
|
|||
APACHE_HTTPS_PORT_NUMBER="" \
|
||||
APACHE_HTTP_PORT_NUMBER="" \
|
||||
BITNAMI_APP_NAME="magento" \
|
||||
BITNAMI_IMAGE_VERSION="2.4.3-debian-10-r67" \
|
||||
BITNAMI_IMAGE_VERSION="2.4.3-debian-10-r68" \
|
||||
MARIADB_HOST="mariadb" \
|
||||
MARIADB_PORT_NUMBER="3306" \
|
||||
MARIADB_ROOT_PASSWORD="" \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -2,5 +2,6 @@
|
|||
{{before_vhost_configuration}}
|
||||
<VirtualHost {{http_listen_addresses}}>
|
||||
{{server_name_configuration}}
|
||||
{{additional_http_configuration}}
|
||||
{{additional_configuration}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
{{acl_configuration}}
|
||||
{{extra_directory_configuration}}
|
||||
</Directory>
|
||||
{{additional_http_configuration}}
|
||||
{{additional_configuration}}
|
||||
{{htaccess_include}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
{{acl_configuration}}
|
||||
{{extra_directory_configuration}}
|
||||
</Directory>
|
||||
{{additional_https_configuration}}
|
||||
{{additional_configuration}}
|
||||
{{htaccess_include}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -6,5 +6,6 @@
|
|||
{{proxy_http_configuration}}
|
||||
ProxyPass / {{proxy_address}}
|
||||
ProxyPassReverse / {{proxy_address}}
|
||||
{{additional_http_configuration}}
|
||||
{{additional_configuration}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@
|
|||
{{proxy_https_configuration}}
|
||||
ProxyPass / {{proxy_address}}
|
||||
ProxyPassReverse / {{proxy_address}}
|
||||
{{additional_https_configuration}}
|
||||
{{additional_configuration}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -11,5 +11,6 @@ PassengerPreStart http://localhost:{{http_port}}/
|
|||
PassengerEnabled on
|
||||
{{extra_directory_configuration}}
|
||||
</Directory>
|
||||
{{additional_http_configuration}}
|
||||
{{additional_configuration}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -14,5 +14,6 @@ PassengerPreStart https://localhost:{{https_port}}/
|
|||
PassengerEnabled on
|
||||
{{extra_directory_configuration}}
|
||||
</Directory>
|
||||
{{additional_https_configuration}}
|
||||
{{additional_configuration}}
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -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)"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,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/).
|
||||
|
||||
|
||||
* [`2`, `2-debian-10`, `2.4.3`, `2.4.3-debian-10-r67`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.4.3-debian-10-r67/2/debian-10/Dockerfile)
|
||||
* [`2`, `2-debian-10`, `2.4.3`, `2.4.3-debian-10-r68`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.4.3-debian-10-r68/2/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/magento GitHub repo](https://github.com/bitnami/bitnami-docker-magento).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue