From 90b437de8d2365f28ca3c835338b6982d48cd8b7 Mon Sep 17 00:00:00 2001
From: Jacob Rohlman <jacobrohlman@SpaceCAMP65.local>
Date: Thu, 2 Sep 2021 14:39:43 -0500
Subject: [PATCH] initial setup

---
 Dockerfile | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f7731df..60d47ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,37 +9,21 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER root
 
 COPY --from=base /usr/local/tomcat/ /usr/local/tomcat 
-COPY --from=base /usr/local/openjdk-8/ /usr/local/openjdk-8
 
 RUN dnf -y update && \
-    dnf -y install ca-certificates curl wget gnupg dirmngr git  procps bzip2 unzip fontconfig  p11-kit && \ 
+    dnf -y install ca-certificates curl gnupg dirmngr git procps bzip2 unzip fontconfig  p11-kit && \ 
     set -ex && \
     set -eux && \
     rm -rf /var/lib/apt/lists/* && \
     dnf clean all
 
-ENV JAVA_HOME=/usr/local/openjdk-8
-
-RUN { echo '#/bin/sh'; echo 'echo "$JAVA_HOME"'; } > /usr/local/bin/docker-java-home && \
-    chmod +x /usr/local/bin/docker-java-home && \
-    [ "$JAVA_HOME" = "$(docker-java-home)" ]
-
-ENV PATH=/usr/local/openjdk-8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV LANG=C.UTF-8
-ENV JAVA_VERSION=8u302
 ENV CATALINA_HOME=/usr/local/tomcat
 ENV PATH=/usr/local/tomcat/bin:/usr/local/openjdk-8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN mkdir -p "$CATALINA_HOME"
 WORKDIR /usr/local/tomcat
 
-ENV TOMCAT_NATIVE_LIBDIR=/usr/local/tomcat/native-jni-lib
-ENV LD_LIBRARY_PATH=/usr/local/tomcat/native-jni-lib
-ENV TOMCAT_MAJOR=8
-ENV TOMCAT_VERSION=8.5.70
-ENV TOMCAT_SHA512=10d306a2ea27e10b914556678763e2b1295ffdaa3da042db586d39b9ab95640bd3e1b81627f96c61f400f2db98a7d4b4bbdf21dc3238c8d0025bf95b08f2f61c
-
-RUN rm -rf /usr/libexec/openssh/ssh-keysign /usr/share/doc/perl-IO-Socket-SSL/certs/* /usr/share/doc/perl-IO-Socket-SSL/example/* /usr/share/doc/perl-Net-SSLeay/examples/*
+RUN chmod -t /usr/libexec/openssh/ssh-keysign /usr/share/doc/perl-IO-Socket-SSL/certs/* /usr/share/doc/perl-IO-Socket-SSL/example/* /usr/share/doc/perl-Net-SSLeay/examples/*
 
 EXPOSE 8080
 
-- 
GitLab