Revert "Updated image base to OL8".

The change was pushed too late in the release cycle,
it requires yum repo changes that couldn't be made on time.

Change-Id: If5285346fe91bc08b82e6ce9b234a91c49630fd7

Author: Piotr Obrzut

5.6/Dockerfile

@@ -12,25 +12,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-FROM oraclelinux:8-slim
+FROM oraclelinux:7-slim
 
 ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.6.46
 ARG MYSQL_SHELL_PACKAGE=
 
 # Install server
-RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
-  && dnf module disable -y mysql \
-  && dnf install -y yum-utils https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
+RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
       https://repo.mysql.com/mysql-community-release-el7.rpm \
-  && dnf config-manager --enable mysql56-server-minimal \
-  && dnf install -y \
+  && yum-config-manager --enable mysql56-server-minimal \
+  && yum install -y \
       $MYSQL_SERVER_PACKAGE \
       $MYSQL_SHELL_PACKAGE \
       libpwquality \
-      # password generation
-      cracklib-dicts \
-      perl-Getopt-Long \
-  && dnf clean all \
+  && yum clean all \
   && mkdir /docker-entrypoint-initdb.d
 
 VOLUME /var/lib/mysql

5.7/Dockerfile

@@ -12,25 +12,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-FROM oraclelinux:8-slim
+FROM oraclelinux:7-slim
 
 ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.7.28
 ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.18
 
 # Install server
-RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
-  && dnf module disable -y mysql \
-  && dnf install -y yum-utils https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
+RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
       https://repo.mysql.com/mysql-community-release-el7.rpm \
-  && dnf config-manager --enable mysql57-server-minimal \
-  && dnf install -y \
+  && yum-config-manager --enable mysql57-server-minimal \
+  && yum install -y \
       $MYSQL_SERVER_PACKAGE \
       $MYSQL_SHELL_PACKAGE \
       libpwquality \
-      # password generation
-      cracklib-dicts \
-       \
-  && dnf clean all \
+  && yum clean all \
   && mkdir /docker-entrypoint-initdb.d
 
 VOLUME /var/lib/mysql

8.0/Dockerfile

@@ -12,25 +12,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-FROM oraclelinux:8-slim
+FROM oraclelinux:7-slim
 
 ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-8.0.18
 ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.18
 
 # Install server
-RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
-  && dnf module disable -y mysql \
-  && dnf install -y yum-utils https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
+RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \
       https://repo.mysql.com/mysql-community-release-el7.rpm \
-  && dnf config-manager --enable mysql80-server-minimal \
-  && dnf install -y \
+  && yum-config-manager --enable mysql80-server-minimal \
+  && yum install -y \
       $MYSQL_SERVER_PACKAGE \
       $MYSQL_SHELL_PACKAGE \
       libpwquality \
-      # password generation
-      cracklib-dicts \
-       \
-  && dnf clean all \
+  && yum clean all \
   && mkdir /docker-entrypoint-initdb.d
 
 VOLUME /var/lib/mysql

gen_dockerfiles.sh

@@ -56,12 +56,6 @@ STARTUP_WAIT["5.6"]="\"yes\""
 STARTUP_WAIT["5.7"]="\"\""
 STARTUP_WAIT["8.0"]="\"\""
 
-declare -A EXTRA_DEPENDENCIES
-EXTRA_DEPENDENCIES["5.5"]=""
-EXTRA_DEPENDENCIES["5.6"]="perl-Getopt-Long"
-EXTRA_DEPENDENCIES["5.7"]=""
-EXTRA_DEPENDENCIES["8.0"]=""
-
 # The option to set a user as expired, (forcing a password change before
 # any other action can be taken) was added in 5.6
 declare -A EXPIRE_SUPPORT
@@ -99,7 +93,6 @@ do
   sed -i 's#%%REPO%%#'"${REPO}"'#g' tmpfile
   REPO_VERSION=${VERSION//\./}
   sed -i 's#%%REPO_VERSION%%#'"${REPO_VERSION}"'#g' tmpfile
-  sed -i 's#%%EXTRA_DEPENDENCIES%%#'"${EXTRA_DEPENDENCIES[${VERSION}]}"'#g' tmpfile
 
   if [[ ! -z ${MYSQL_SHELL_VERSIONS[${VERSION}]} ]]; then
     sed -i 's#%%MYSQL_SHELL_PACKAGE%%#'"mysql-shell-${MYSQL_SHELL_VERSIONS[${VERSION}]}"'#g' tmpfile

template/Dockerfile

@@ -12,25 +12,20 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-FROM oraclelinux:8-slim
+FROM oraclelinux:7-slim
 
 ARG MYSQL_SERVER_PACKAGE=%%MYSQL_SERVER_PACKAGE%%
 ARG MYSQL_SHELL_PACKAGE=%%MYSQL_SHELL_PACKAGE%%
 
 # Install server
-RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
-  && dnf module disable -y mysql \
-  && dnf install -y yum-utils %%REPO%%/mysql-community-minimal-release-el7.rpm \
+RUN yum install -y %%REPO%%/mysql-community-minimal-release-el7.rpm \
       %%REPO%%/mysql-community-release-el7.rpm \
-  && dnf config-manager --enable mysql%%REPO_VERSION%%-server-minimal \
-  && dnf install -y \
+  && yum-config-manager --enable mysql%%REPO_VERSION%%-server-minimal \
+  && yum install -y \
       $MYSQL_SERVER_PACKAGE \
       $MYSQL_SHELL_PACKAGE \
       libpwquality \
-      # password generation
-      cracklib-dicts \
-      %%EXTRA_DEPENDENCIES%% \
-  && dnf clean all \
+  && yum clean all \
   && mkdir /docker-entrypoint-initdb.d
 
 VOLUME /var/lib/mysql