From 9bf91d426e289391719a11a3e7c1a9b61289a49b Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Tue, 5 Apr 2022 20:45:42 +0200 Subject: [PATCH] ci: rely on skein 0.8.2 and remove workaround --- .../docker/hadoop/Dockerfile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/continuous_integration/docker/hadoop/Dockerfile b/continuous_integration/docker/hadoop/Dockerfile index af15d918..6f7a6378 100644 --- a/continuous_integration/docker/hadoop/Dockerfile +++ b/continuous_integration/docker/hadoop/Dockerfile @@ -22,15 +22,12 @@ RUN groupadd --system hadoop \ # # - Java 8+ (java-1.8.0-openjdk, java-11-openjdk) # -# But, we make it java-1.8.0-openjdk-devel so that we have whats needed to -# build skein's .jar file from scratch. -# # - OpenSSL 1.1 (openssl 1.0 comes with centos:7, found via epel-release repo) # RUN yum install -y \ epel-release \ && yum install -y \ - java-1.8.0-openjdk-devel \ + java-1.8.0-openjdk \ openssl11-libs \ && yum clean all \ && rm -rf /var/cache/yum @@ -149,16 +146,3 @@ COPY ./files/etc/supervisord.conf /etc/ # 4. Configure the container to start supervisord with our configuration. # ENTRYPOINT ["/usr/bin/supervisord", "--configuration", "/etc/supervisord.conf"] - -# For now let's build skein from scratch with misc bugfixes, if -# https://github.com/jcrist/skein/issues/245 is resolved we can remove this. -# -# 0. We have installed -devel version of openjdk -# 1. We install maven as a build dependency for skein -# 2. We install a fork of skein with fixes to make it successfully build from -# sdist and not have a corrupt CLASSPATH set. -# 3. We uninstall maven to avoid getting multiple versions of java or similar. -# -RUN mamba install -y maven \ - && pip install https://github.com/consideratio/skein/archive/master.zip \ - && mamba uninstall -y maven