Skip to content

Commit a8808d1

Browse files
authored
Merge pull request #871 from infosiftr/skip_missing_names_on_install
Add --setopt=skip_missing_names_on_install=False to "yum install"
2 parents 8720110 + 35b9008 commit a8808d1

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

5.7/Dockerfile.oracle

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

template/Dockerfile.oracle

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
{{ def dnf: if .oracle.variant | startswith("7") then "yum" else "microdnf" end -}}
1+
{{
2+
def dnf:
3+
if .oracle.variant | startswith("7") then
4+
"yum"
5+
else
6+
"microdnf"
7+
end
8+
;
9+
def dnf_install:
10+
dnf + " install -y"
11+
| if . == "yum install -y" then
12+
# --setopt=skip_missing_names_on_install=False: https://unix.stackexchange.com/a/477127/153467
13+
. + " --setopt=skip_missing_names_on_install=False"
14+
else . end
15+
-}}
216
FROM oraclelinux:{{ .oracle.variant }}
317

418
RUN set -eux; \
@@ -34,7 +48,11 @@ RUN set -eux; \
3448
gosu nobody true
3549

3650
RUN set -eux; \
37-
{{ dnf }} install -y \
51+
{{ if .oracle.variant | startswith("7") then ( -}}
52+
# https://github.com/docker-library/mysql/pull/871#issuecomment-1167954236
53+
{{ dnf_install }} oracle-epel-release-el7; \
54+
{{ ) else "" end -}}
55+
{{ dnf_install }} \
3856
bzip2 \
3957
gzip \
4058
openssl \
@@ -73,7 +91,7 @@ RUN set -eu; \
7391
} | tee /etc/yum.repos.d/mysql-community-minimal.repo
7492

7593
RUN set -eux; \
76-
{{ dnf }} install -y "mysql-community-server-minimal-$MYSQL_VERSION"; \
94+
{{ dnf_install }} "mysql-community-server-minimal-$MYSQL_VERSION"; \
7795
{{ dnf }} clean all; \
7896
# the "socket" value in the Oracle packages is set to "/var/lib/mysql" which isn't a great place for the socket (we want it in "/var/run/mysqld" instead)
7997
# https://github.com/docker-library/mysql/pull/680#issuecomment-636121520
@@ -104,7 +122,7 @@ RUN set -eu; \
104122
} | tee /etc/yum.repos.d/mysql-community-tools.repo
105123
ENV MYSQL_SHELL_VERSION {{ .["mysql-shell"].version }}
106124
RUN set -eux; \
107-
{{ dnf }} install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
125+
{{ dnf_install }} "mysql-shell-$MYSQL_SHELL_VERSION"; \
108126
{{ dnf }} clean all; \
109127
\
110128
mysqlsh --version

0 commit comments

Comments
 (0)