1.1.5 release

mickoallen · Apr 19, 2018 · 6c4a6de · 6c4a6de
1 parent f5bbba9
commit 6c4a6de
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 19 deletions.
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 FROM oraclelinux:7-slim
 
-ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.5-community/docker/x86_64/mysql-community-server-minimal-5.5.59-2.el7.x86_64.rpm
+ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.5-community/docker/x86_64/mysql-community-server-minimal-5.5.60-2.el7.x86_64.rpm
 ARG PACKAGE_URL_SHELL=""
 
 # Install server

diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 set -e
 
-echo "[Entrypoint] MySQL Docker Image 5.5.59-1.1.4"
+echo "[Entrypoint] MySQL Docker Image 5.5.60-1.1.5"
 # Fetch value from server config
 # We use mysqld --verbose --help instead of my_print_defaults because the
 # latter only show values present in config files, and not server defaults
@@ -202,7 +202,7 @@ password=healthcheckpass
 EOF
 	touch /mysql-init-complete
 	chown -R mysql:mysql "$DATADIR"
-	echo "[Entrypoint] Starting MySQL 5.5.59-1.1.4"
+	echo "[Entrypoint] Starting MySQL 5.5.60-1.1.5"
 fi
 
 exec "$@"

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 FROM oraclelinux:7-slim
 
-ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.39-2.el7.x86_64.rpm
+ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.40-2.el7.x86_64.rpm
 ARG PACKAGE_URL_SHELL=""
 
 # Install server

diff --git a/5.6/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 set -e
 
-echo "[Entrypoint] MySQL Docker Image 5.6.39-1.1.4"
+echo "[Entrypoint] MySQL Docker Image 5.6.40-1.1.5"
 # Fetch value from server config
 # We use mysqld --verbose --help instead of my_print_defaults because the
 # latter only show values present in config files, and not server defaults
@@ -202,7 +202,7 @@ password=healthcheckpass
 EOF
 	touch /mysql-init-complete
 	chown -R mysql:mysql "$DATADIR"
-	echo "[Entrypoint] Starting MySQL 5.6.39-1.1.4"
+	echo "[Entrypoint] Starting MySQL 5.6.40-1.1.5"
 fi
 
 exec "$@"

diff --git a/5.7/Dockerfile b/5.7/Dockerfile
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 FROM oraclelinux:7-slim
 
-ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.21-1.el7.x86_64.rpm
+ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.22-1.el7.x86_64.rpm
 ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-1.0.11-1.el7.x86_64.rpm
 
 # Install server

diff --git a/5.7/docker-entrypoint.sh b/5.7/docker-entrypoint.sh
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 set -e
 
-echo "[Entrypoint] MySQL Docker Image 5.7.21-1.1.4"
+echo "[Entrypoint] MySQL Docker Image 5.7.22-1.1.5"
 # Fetch value from server config
 # We use mysqld --verbose --help instead of my_print_defaults because the
 # latter only show values present in config files, and not server defaults
@@ -202,7 +202,7 @@ password=healthcheckpass
 EOF
 	touch /mysql-init-complete
 	chown -R mysql:mysql "$DATADIR"
-	echo "[Entrypoint] Starting MySQL 5.7.21-1.1.4"
+	echo "[Entrypoint] Starting MySQL 5.7.22-1.1.5"
 fi
 
 exec "$@"

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -14,8 +14,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 FROM oraclelinux:7-slim
 
-ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.4-0.1.rc.el7.x86_64.rpm
-ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-preview/el/7/x86_64/mysql-shell-8.0.3-0.1.dmr.el7.x86_64.rpm
+ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.11-1.el7.x86_64.rpm
+ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-8.0.11-1.el7.x86_64.rpm
 
 # Install server
 RUN rpmkeys --import https://repo.mysql.com/RPM-GPG-KEY-mysql \

diff --git a/8.0/docker-entrypoint.sh b/8.0/docker-entrypoint.sh
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 set -e
 
-echo "[Entrypoint] MySQL Docker Image 8.0.4-1.1.4"
+echo "[Entrypoint] MySQL Docker Image 8.0.11-1.1.5"
 # Fetch value from server config
 # We use mysqld --verbose --help instead of my_print_defaults because the
 # latter only show values present in config files, and not server defaults
@@ -202,7 +202,7 @@ password=healthcheckpass
 EOF
 	touch /mysql-init-complete
 	chown -R mysql:mysql "$DATADIR"
-	echo "[Entrypoint] Starting MySQL 8.0.4-1.1.4"
+	echo "[Entrypoint] Starting MySQL 8.0.11-1.1.5"
 fi
 
 exec "$@"

diff --git a/changelog b/changelog
@@ -1,3 +1,8 @@
+Changes in 1.1.5 (2018-04-19)
+ * Bumped server versions to 5.5.60, 5.6.40, 5.7.22
+ * MySQL Server 8.0 updated to 8.0.11
+ * Bumped Shell 8.0 version to 8.0.11
+
 Changes in 1.1.4 (2018-01-24)
  * MySQL Server 8.0 updated to 8.0.4-rc
 

diff --git a/genOracleLinux.sh b/genOracleLinux.sh
@@ -28,16 +28,16 @@ SERVER_VERSION_FULL["5.7"]="${VERSION_SERVER_57}-${VERSION_DOCKER}"
 SERVER_VERSION_FULL["8.0"]="${VERSION_SERVER_80}-${VERSION_DOCKER}"
 
 declare -A PACKAGE_URL
-PACKAGE_URL["5.5"]="https://repo.mysql.com/yum/mysql-5.5-community/docker/x86_64/mysql-community-server-minimal-5.5.59-2.el7.x86_64.rpm"
-PACKAGE_URL["5.6"]="https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.39-2.el7.x86_64.rpm"
-PACKAGE_URL["5.7"]="https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.21-1.el7.x86_64.rpm"
-PACKAGE_URL["8.0"]="https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.4-0.1.rc.el7.x86_64.rpm"
+PACKAGE_URL["5.5"]="https://repo.mysql.com/yum/mysql-5.5-community/docker/x86_64/mysql-community-server-minimal-5.5.60-2.el7.x86_64.rpm"
+PACKAGE_URL["5.6"]="https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.40-2.el7.x86_64.rpm"
+PACKAGE_URL["5.7"]="https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.22-1.el7.x86_64.rpm"
+PACKAGE_URL["8.0"]="https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.11-1.el7.x86_64.rpm"
 
 declare -A PACKAGE_URL_SHELL
 PACKAGE_URL_SHELL["5.5"]="\"\""
 PACKAGE_URL_SHELL["5.6"]="\"\""
 PACKAGE_URL_SHELL["5.7"]="https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-1.0.11-1.el7.x86_64.rpm"
-PACKAGE_URL_SHELL["8.0"]="https://repo.mysql.com/yum/mysql-tools-preview/el/7/x86_64/mysql-shell-8.0.3-0.1.dmr.el7.x86_64.rpm"
+PACKAGE_URL_SHELL["8.0"]="https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-8.0.11-1.el7.x86_64.rpm"
 
 # 33060 is the default port for the mysqlx plugin, new to 5.7
 declare -A PORTS

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -43,7 +43,8 @@ done
 echo "...Locating shell packages"
 
 REPOURL_SHELL_10="https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/"
-REPOURL_SHELL_80="https://repo.mysql.com/yum/mysql-tools-preview/el/7/x86_64/"
+REPOURL_SHELL_80="https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/"
+#REPOURL_SHELL_80="https://repo.mysql.com/yum/mysql-tools-preview/el/7/x86_64/"
 FILENAME_SHELL_10=$(wget -q -O - $REPOURL_SHELL_10 | grep mysql-shell-$VERSION_SHELL_10 | cut -d \" -f 6 | sort -r | head -1)
 FILENAME_SHELL_80=$(wget -q -O - $REPOURL_SHELL_80 | grep mysql-shell-$VERSION_SHELL_80 | cut -d \" -f 6 | sort -r | head -1)
 if [ -z "$FILENAME_SHELL_10" ];