From 7cadf4f03d3bcdca0e0d2e6d73abd417ec9b9267 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 9 Jun 2021 21:24:19 -0400 Subject: [PATCH] Added Oracle Linux 8 images instead of CentOS 8 --- agent2/ol/Dockerfile | 1 + java-gateway/ol/Dockerfile | 1 + proxy-mysql/ol/Dockerfile | 1 + proxy-sqlite3/ol/Dockerfile | 1 + server-mysql/ol/Dockerfile | 1 + server-pgsql/ol/Dockerfile | 1 + web-apache-mysql/ol/Dockerfile | 1 + web-apache-pgsql/ol/Dockerfile | 1 + web-nginx-mysql/ol/Dockerfile | 1 + web-nginx-pgsql/ol/Dockerfile | 1 + 10 files changed, 10 insertions(+) diff --git a/agent2/ol/Dockerfile b/agent2/ol/Dockerfile index f389a1f2b..8b987d416 100644 --- a/agent2/ol/Dockerfile +++ b/agent2/ol/Dockerfile @@ -86,6 +86,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile index d9dae2364..e52c55d2e 100644 --- a/java-gateway/ol/Dockerfile +++ b/java-gateway/ol/Dockerfile @@ -52,6 +52,7 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/proxy-mysql/ol/Dockerfile b/proxy-mysql/ol/Dockerfile index a58e5db1c..a18d8c2e8 100644 --- a/proxy-mysql/ol/Dockerfile +++ b/proxy-mysql/ol/Dockerfile @@ -113,6 +113,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/proxy-sqlite3/ol/Dockerfile b/proxy-sqlite3/ol/Dockerfile index 1d68ead68..bd9160fc2 100644 --- a/proxy-sqlite3/ol/Dockerfile +++ b/proxy-sqlite3/ol/Dockerfile @@ -110,6 +110,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/server-mysql/ol/Dockerfile b/server-mysql/ol/Dockerfile index 786acc8da..bf13d17cf 100644 --- a/server-mysql/ol/Dockerfile +++ b/server-mysql/ol/Dockerfile @@ -118,6 +118,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/server-pgsql/ol/Dockerfile b/server-pgsql/ol/Dockerfile index ed5957ad1..0ab8823ad 100644 --- a/server-pgsql/ol/Dockerfile +++ b/server-pgsql/ol/Dockerfile @@ -116,6 +116,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /tmp/ && \ diff --git a/web-apache-mysql/ol/Dockerfile b/web-apache-mysql/ol/Dockerfile index 052da052d..be4562e3a 100644 --- a/web-apache-mysql/ol/Dockerfile +++ b/web-apache-mysql/ol/Dockerfile @@ -76,6 +76,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \ diff --git a/web-apache-pgsql/ol/Dockerfile b/web-apache-pgsql/ol/Dockerfile index 939c53f82..694d14ce7 100644 --- a/web-apache-pgsql/ol/Dockerfile +++ b/web-apache-pgsql/ol/Dockerfile @@ -75,6 +75,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \ diff --git a/web-nginx-mysql/ol/Dockerfile b/web-nginx-mysql/ol/Dockerfile index a9d1f1f16..17fefa3c8 100644 --- a/web-nginx-mysql/ol/Dockerfile +++ b/web-nginx-mysql/ol/Dockerfile @@ -68,6 +68,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \ diff --git a/web-nginx-pgsql/ol/Dockerfile b/web-nginx-pgsql/ol/Dockerfile index c7531bc75..0a1b89f18 100644 --- a/web-nginx-pgsql/ol/Dockerfile +++ b/web-nginx-pgsql/ol/Dockerfile @@ -67,6 +67,7 @@ RUN set -eux && \ --nodocs dnf && \ mkdir -p /etc/yum/vars/ && \ echo "" > /etc/yum/vars/ociregion && \ + echo "oracle.com" > /etc/yum/vars/ocidomain && \ dnf -y install --disablerepo "*" --enablerepo "${REPOLIST}" --setopt=install_weak_deps=False --best \ --setopt=tsflags=nodocs ${INSTALL_PKGS} && \ cd /usr/share/ && \