Migrate from CentOS to Alma Linux 9

trinodb · Jul 2, 2024 · a881d10 · a881d10
1 parent 8064bb8
commit a881d10
Show file tree

Hide file tree

Showing 35 changed files with 16 additions and 16 deletions.
diff --git a/testing/accumulo/Dockerfile b/testing/accumulo/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj11:unlabelled$ARCH
+FROM testing/almalinux9-oj11:unlabelled$ARCH
 
 ARG ACCUMULO_VERSION=3.0.0
 ARG HADOOP_VERSION=3.3.5

diff --git a/testing/centos7-oj11/Dockerfile → testing/almalinux9-oj11/Dockerfile b/testing/centos7-oj11/Dockerfile → testing/almalinux9-oj11/Dockerfile
@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM library/centos:7
+FROM library/almalinux:9
 
 COPY ./files /
 
@@ -30,7 +30,7 @@ RUN \
     alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
     \
     # install supervisor
-    yum --enablerepo=extras install -y setuptools epel-release && \
+    yum --enablerepo=extras install -y epel-release && \
     yum install -y supervisor && \
     \
     # install commonly needed packages

diff --git a/...j11/files/opt/trinodev/site-override.xslt → ...j11/files/opt/trinodev/site-override.xslt b/...j11/files/opt/trinodev/site-override.xslt → ...j11/files/opt/trinodev/site-override.xslt
diff --git a/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides b/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides
diff --git a/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override b/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override
diff --git a/...oj17-openldap-active-directory/Dockerfile → ...oj17-openldap-active-directory/Dockerfile b/...oj17-openldap-active-directory/Dockerfile → ...oj17-openldap-active-directory/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17-openldap-base:unlabelled$ARCH
+FROM testing/almalinux9-oj17-openldap-base:unlabelled$ARCH
 
 # COPY CONFIGURATION
 COPY ./files /

diff --git a/...tory/files/etc/openldap/setup/msuser.ldif → ...tory/files/etc/openldap/setup/msuser.ldif b/...tory/files/etc/openldap/setup/msuser.ldif → ...tory/files/etc/openldap/setup/msuser.ldif
diff --git a/...ing/centos7-oj17-openldap-base/Dockerfile → .../almalinux9-oj17-openldap-base/Dockerfile b/...ing/centos7-oj17-openldap-base/Dockerfile → .../almalinux9-oj17-openldap-base/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17:unlabelled$ARCH
+FROM testing/almalinux9-oj17:unlabelled$ARCH
 
 # INSTALL OPENLDAP
 RUN yum -y install openssl openldap openldap-clients openldap-servers \

diff --git a/...ap/certs/active-directory-certificate.crt → ...ap/certs/active-directory-certificate.crt b/...ap/certs/active-directory-certificate.crt → ...ap/certs/active-directory-certificate.crt
diff --git a/...c/openldap/certs/openldap-certificate.pem → ...c/openldap/certs/openldap-certificate.pem b/...c/openldap/certs/openldap-certificate.pem → ...c/openldap/certs/openldap-certificate.pem
diff --git a/...base/files/etc/openldap/certs/private.pem → ...base/files/etc/openldap/certs/private.pem b/...base/files/etc/openldap/certs/private.pem → ...base/files/etc/openldap/certs/private.pem
diff --git a/...-base/files/etc/openldap/certs/serial.txt → ...-base/files/etc/openldap/certs/serial.txt b/...-base/files/etc/openldap/certs/serial.txt → ...-base/files/etc/openldap/certs/serial.txt
diff --git a/...ldap/certs/trino-coordinator-for-ldap.pem → ...ldap/certs/trino-coordinator-for-ldap.pem b/...ldap/certs/trino-coordinator-for-ldap.pem → ...ldap/certs/trino-coordinator-for-ldap.pem
diff --git a/...se/files/etc/openldap/setup/createOU.ldif → ...se/files/etc/openldap/setup/createOU.ldif b/...se/files/etc/openldap/setup/createOU.ldif → ...se/files/etc/openldap/setup/createOU.ldif
diff --git a/...penldap/setup/ldap_disable_bind_anon.ldif → ...penldap/setup/ldap_disable_bind_anon.ldif b/...penldap/setup/ldap_disable_bind_anon.ldif → ...penldap/setup/ldap_disable_bind_anon.ldif
diff --git a/...les/etc/openldap/setup/modify_server.ldif → ...les/etc/openldap/setup/modify_server.ldif b/...les/etc/openldap/setup/modify_server.ldif → ...les/etc/openldap/setup/modify_server.ldif
diff --git a/...-openldap-base/files/etc/supervisord.conf → ...-openldap-base/files/etc/supervisord.conf b/...-openldap-base/files/etc/supervisord.conf → ...-openldap-base/files/etc/supervisord.conf
diff --git a/...p-base/files/etc/supervisord.d/slapd.conf → ...p-base/files/etc/supervisord.d/slapd.conf b/...p-base/files/etc/supervisord.d/slapd.conf → ...p-base/files/etc/supervisord.d/slapd.conf
diff --git a/...ldap-base/files/usr/bin/wait-for-slapd.sh → ...ldap-base/files/usr/bin/wait-for-slapd.sh b/...ldap-base/files/usr/bin/wait-for-slapd.sh → ...ldap-base/files/usr/bin/wait-for-slapd.sh
diff --git a/...17-openldap-base/generate-certificates.md → ...17-openldap-base/generate-certificates.md b/...17-openldap-base/generate-certificates.md → ...17-openldap-base/generate-certificates.md
diff --git a/...entos7-oj17-openldap-referrals/Dockerfile → ...linux9-oj17-openldap-referrals/Dockerfile b/...entos7-oj17-openldap-referrals/Dockerfile → ...linux9-oj17-openldap-referrals/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17-openldap:unlabelled$ARCH
+FROM testing/almalinux9-oj17-openldap:unlabelled$ARCH
 
 # COPY CONFIGURATION
 COPY ./files /

diff --git a/...s/etc/openldap/setup/createReferrals.ldif → ...s/etc/openldap/setup/createReferrals.ldif b/...s/etc/openldap/setup/createReferrals.ldif → ...s/etc/openldap/setup/createReferrals.ldif
diff --git a/testing/centos7-oj17-openldap/Dockerfile → testing/almalinux9-oj17-openldap/Dockerfile b/testing/centos7-oj17-openldap/Dockerfile → testing/almalinux9-oj17-openldap/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17-openldap-base:unlabelled$ARCH
+FROM testing/almalinux9-oj17-openldap-base:unlabelled$ARCH
 
 # COPY CONFIGURATION
 COPY ./files /

diff --git a/...ap/files/etc/openldap/setup/memberof.ldif → ...ap/files/etc/openldap/setup/memberof.ldif b/...ap/files/etc/openldap/setup/memberof.ldif → ...ap/files/etc/openldap/setup/memberof.ldif
diff --git a/...ldap/files/etc/openldap/setup/refint.ldif → ...ldap/files/etc/openldap/setup/refint.ldif b/...ldap/files/etc/openldap/setup/refint.ldif → ...ldap/files/etc/openldap/setup/refint.ldif
diff --git a/testing/centos7-oj17/Dockerfile → testing/almalinux9-oj17/Dockerfile b/testing/centos7-oj17/Dockerfile → testing/almalinux9-oj17/Dockerfile
@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM library/centos:7
+FROM library/almalinux:9
 
 COPY ./files /
 
@@ -30,7 +30,7 @@ RUN \
     alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
     \
     # install supervisor
-    yum --enablerepo=extras install -y setuptools epel-release && \
+    yum --enablerepo=extras install -y epel-release && \
     yum install -y supervisor && \
     \
     # install commonly needed packages

diff --git a/...j17/files/opt/trinodev/site-override.xslt → ...j17/files/opt/trinodev/site-override.xslt b/...j17/files/opt/trinodev/site-override.xslt → ...j17/files/opt/trinodev/site-override.xslt
diff --git a/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides b/...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides
diff --git a/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override b/...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override
diff --git a/testing/hive3.1-hive/Dockerfile b/testing/hive3.1-hive/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17:unlabelled$ARCH
+FROM testing/almalinux9-oj17:unlabelled$ARCH
 
 ARG JAVA8_ZULU_VERSION=8.64.0.19-ca-jdk8.0.345
 
@@ -32,7 +32,7 @@ RUN yum install -y \
     alternatives --set javac /usr/lib/jvm/zulu-8/bin/javac \
     && yum -q clean all && rm -rf /var/cache/yum
 
-# Override JAVA_HOME inherited from testing/centos7-oj17
+# Override JAVA_HOME inherited from testing/almalinux9-oj17
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8
 
 ARG HADOOP_VERSION=3.1.2

diff --git a/testing/kerberos/Dockerfile b/testing/kerberos/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj17:unlabelled$ARCH
+FROM testing/almalinux9-oj17:unlabelled$ARCH
 
 ARG ADDPRINC_ARGS="-maxrenewlife \"10 days\" +allow_renewable"
 

diff --git a/testing/phoenix5/Dockerfile b/testing/phoenix5/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj11:unlabelled$ARCH
+FROM testing/almalinux9-oj11:unlabelled$ARCH
 
 ARG HBASE_VERSION=2.5.8
 ARG ZOOKEEPER_VERSION=3.9.2

diff --git a/testing/spark3-delta/Dockerfile b/testing/spark3-delta/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj11:unlabelled$ARCH
+FROM testing/almalinux9-oj11:unlabelled$ARCH
 
 ARG SPARK_VERSION=3.5.0
 ARG HADOOP_VERSION=3

diff --git a/testing/spark3-hudi/Dockerfile b/testing/spark3-hudi/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj11:unlabelled$ARCH
+FROM testing/almalinux-oj11:unlabelled$ARCH
 
 ARG SPARK_VERSION=3.3.1
 ARG HADOOP_VERSION=3

diff --git a/testing/spark3-iceberg/Dockerfile b/testing/spark3-iceberg/Dockerfile
@@ -11,7 +11,7 @@
 # limitations under the License.
 
 ARG ARCH
-FROM testing/centos7-oj11:unlabelled$ARCH
+FROM testing/almalinux9-oj11:unlabelled$ARCH
 
 ARG SPARK_VERSION=3.4.2
 ARG HADOOP_VERSION=3