Updated versions

5.6 to 5.6.36 5.7 to 5.7.18 Fixed whitespace issue with build test
adolfmc · Apr 12, 2017 · e9c3d14 · e9c3d14
1 parent e40dee2
commit e9c3d14
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -1,6 +1,5 @@
 FROM oraclelinux:7-slim
-
-ENV PACKAGE_URL https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.35-2.el7.x86_64.rpm
+ENV PACKAGE_URL https://repo.mysql.com/yum/mysql-5.6-community/docker/x86_64/mysql-community-server-minimal-5.6.36-2.el7.x86_64.rpm
 
 # Install server
 RUN rpmkeys --import http://repo.mysql.com/RPM-GPG-KEY-mysql \

diff --git a/5.7/Dockerfile b/5.7/Dockerfile
@@ -1,5 +1,5 @@
 FROM oraclelinux:7-slim
-ENV PACKAGE_URL https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.17-1.el7.x86_64.rpm
+ENV PACKAGE_URL https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.18-1.el7.x86_64.rpm
 
 # Install server
 RUN rpmkeys --import http://repo.mysql.com/RPM-GPG-KEY-mysql \

diff --git a/test/testbuild.sh b/test/testbuild.sh
@@ -16,7 +16,7 @@ fi
 
 
 IMAGELIST=$(docker images | grep $VERSION)
-versionregex="mysql/mysql-server   $VERSION"
+versionregex="mysql/mysql-server\s*$VERSION"
 if [[ $IMAGELIST =~ $versionregex ]];
 then
 	echo "Test passed"