diff --git a/bitnami/mysql/5.7/debian-10/Dockerfile b/bitnami/mysql/5.7/debian-10/Dockerfile index ab92a4080e85..acb9a720db1f 100644 --- a/bitnami/mysql/5.7/debian-10/Dockerfile +++ b/bitnami/mysql/5.7/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mysql/postunpack.sh ENV BITNAMI_APP_NAME="mysql" \ - BITNAMI_IMAGE_VERSION="5.7.33-debian-10-r73" \ + BITNAMI_IMAGE_VERSION="5.7.33-debian-10-r74" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mysql/bin:/opt/bitnami/mysql/sbin:$PATH" EXPOSE 3306 diff --git a/bitnami/mysql/5.7/debian-10/docker-compose.yml b/bitnami/mysql/5.7/debian-10/docker-compose.yml index bd614012b9ae..b57b223539f9 100644 --- a/bitnami/mysql/5.7/debian-10/docker-compose.yml +++ b/bitnami/mysql/5.7/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.1' services: mysql: - image: 'docker.io/bitnami/mysql:5.7-debian-10' + image: docker.io/bitnami/mysql:5.7 ports: - '3306:3306' volumes: diff --git a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..cfc824f5ec83 100644 --- a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,5 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done - echo "$string" | sed "s/^/${indent_unit}/" + echo "${string//^/${indent_unit}}" } diff --git a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/mysql/5.7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh index ff1a9115aaa4..9e4ba7dc1b25 100644 --- a/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh +++ b/bitnami/mysql/5.7/debian-10/rootfs/opt/bitnami/scripts/libmysql.sh @@ -2,7 +2,7 @@ # # Bitnami MySQL library -# shellcheck disable=SC1091 +# shellcheck disable=SC1090,SC1091 # Load Generic Libraries . /opt/bitnami/scripts/libfile.sh @@ -372,6 +372,10 @@ mysql_custom_init_scripts() { fi } +#!/bin/bash +# +# Library for mysql common + ######################## # Extract mysql version from version string # Globals: @@ -386,7 +390,7 @@ mysql_get_version() { local -a ver_split ver_string=$("${DB_BIN_DIR}/mysql" "--version") - ver_split=(${ver_string// / }) + read -r -a ver_split <<< "$ver_string" if [[ "$ver_string" = *" Distrib "* ]]; then echo "${ver_split[4]::-1}" diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md index b546c3dc3022..7afc4b73aaa2 100644 --- a/bitnami/mysql/README.md +++ b/bitnami/mysql/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`8.0`, `8.0-debian-10`, `8.0.23`, `8.0.23-debian-10-r73`, `latest` (8.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/8.0.23-debian-10-r73/8.0/debian-10/Dockerfile) -* [`5.7`, `5.7-debian-10`, `5.7.33`, `5.7.33-debian-10-r73` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.33-debian-10-r73/5.7/debian-10/Dockerfile) +* [`5.7`, `5.7-debian-10`, `5.7.33`, `5.7.33-debian-10-r74` (5.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mysql/blob/5.7.33-debian-10-r74/5.7/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/mysql GitHub repo](https://github.com/bitnami/bitnami-docker-mysql).