Skip to content

Commit 669d23f

Browse files
author
Piotr Obrzut
committed
Revert "Updated image base to OL8".
Change-Id: Ic1c6b15fe0cdbfab5581795eadf9b5761e1ac69e
1 parent 788af61 commit 669d23f

File tree

4 files changed

+20
-40
lines changed

4 files changed

+20
-40
lines changed

7.5/Dockerfile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,21 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16-
FROM oraclelinux:8-slim
16+
FROM oraclelinux:7-slim
1717

1818
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.5.16
1919
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.18
2020

2121
# Install server
22-
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
23-
&& dnf module disable -y mysql \
24-
&& dnf install -y \
25-
yum-utils \
22+
RUN yum install -y \
2623
https://repo.mysql.com/mysql-cluster-community-minimal-release-el7.rpm \
2724
https://repo.mysql.com/mysql-community-release-el7.rpm \
28-
&& dnf config-manager --enable mysql-cluster75-minimal \
29-
&& dnf install -y \
25+
&& yum-config-manager --enable mysql-cluster75-minimal \
26+
&& yum install -y \
3027
$MYSQL_CLUSTER_PACKAGE \
3128
$MYSQL_SHELL_PACKAGE \
3229
libpwquality \
33-
# password generation
34-
cracklib-dicts \
35-
&& dnf clean all \
30+
&& yum clean all \
3631
&& mkdir /docker-entrypoint-initdb.d
3732

3833
VOLUME /var/lib/mysql

7.6/Dockerfile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,21 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16-
FROM oraclelinux:8-slim
16+
FROM oraclelinux:7-slim
1717

1818
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-7.6.12
1919
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.18
2020

2121
# Install server
22-
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
23-
&& dnf module disable -y mysql \
24-
&& dnf install -y \
25-
yum-utils \
22+
RUN yum install -y \
2623
https://repo.mysql.com/mysql-cluster-community-minimal-release-el7.rpm \
2724
https://repo.mysql.com/mysql-community-release-el7.rpm \
28-
&& dnf config-manager --enable mysql-cluster76-minimal \
29-
&& dnf install -y \
25+
&& yum-config-manager --enable mysql-cluster76-minimal \
26+
&& yum install -y \
3027
$MYSQL_CLUSTER_PACKAGE \
3128
$MYSQL_SHELL_PACKAGE \
3229
libpwquality \
33-
# password generation
34-
cracklib-dicts \
35-
&& dnf clean all \
30+
&& yum clean all \
3631
&& mkdir /docker-entrypoint-initdb.d
3732

3833
VOLUME /var/lib/mysql

8.0/Dockerfile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,21 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16-
FROM oraclelinux:8-slim
16+
FROM oraclelinux:7-slim
1717

1818
ARG MYSQL_CLUSTER_PACKAGE=mysql-cluster-community-server-minimal-8.0.18
1919
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.18
2020

2121
# Install server
22-
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
23-
&& dnf module disable -y mysql \
24-
&& dnf install -y \
25-
yum-utils \
22+
RUN yum install -y \
2623
https://repo.mysql.com/mysql-cluster-community-minimal-release-el7.rpm \
2724
https://repo.mysql.com/mysql-community-release-el7.rpm \
28-
&& dnf config-manager --enable mysql-cluster80-minimal \
29-
&& dnf install -y \
25+
&& yum-config-manager --enable mysql-cluster80-minimal \
26+
&& yum install -y \
3027
$MYSQL_CLUSTER_PACKAGE \
3128
$MYSQL_SHELL_PACKAGE \
3229
libpwquality \
33-
# password generation
34-
cracklib-dicts \
35-
&& dnf clean all \
30+
&& yum clean all \
3631
&& mkdir /docker-entrypoint-initdb.d
3732

3833
VOLUME /var/lib/mysql

template/Dockerfile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,21 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16-
FROM oraclelinux:8-slim
16+
FROM oraclelinux:7-slim
1717

1818
ARG MYSQL_CLUSTER_PACKAGE=%%MYSQL_CLUSTER_PACKAGE%%
1919
ARG MYSQL_SHELL_PACKAGE=%%MYSQL_SHELL_PACKAGE%%
2020

2121
# Install server
22-
RUN microdnf update && echo "[main]" > /etc/dnf/dnf.conf \
23-
&& dnf module disable -y mysql \
24-
&& dnf install -y \
25-
yum-utils \
22+
RUN yum install -y \
2623
%%REPO%%/mysql-cluster-community-minimal-release-el7.rpm \
2724
%%REPO%%/mysql-community-release-el7.rpm \
28-
&& dnf config-manager --enable mysql-cluster%%REPO_VERSION%%-minimal \
29-
&& dnf install -y \
25+
&& yum-config-manager --enable mysql-cluster%%REPO_VERSION%%-minimal \
26+
&& yum install -y \
3027
$MYSQL_CLUSTER_PACKAGE \
3128
$MYSQL_SHELL_PACKAGE \
3229
libpwquality \
33-
# password generation
34-
cracklib-dicts \
35-
&& dnf clean all \
30+
&& yum clean all \
3631
&& mkdir /docker-entrypoint-initdb.d
3732

3833
VOLUME /var/lib/mysql

0 commit comments

Comments
 (0)