modernized 4 Dockerfiles

SAP · Nov 19, 2024 · 674ba2a · 674ba2a
1 parent 149091f
commit 674ba2a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/.github/actions/project-security-label-threshold-action/Dockerfile b/.github/actions/project-security-label-threshold-action/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y git jupyter python3-pandas python3-yaml cowsay
 
-ENV PATH $PATH:/usr/games
+ENV PATH=$PATH:/usr/games
 
 COPY entrypoint.sh /opt/entrypoint.sh
 

diff --git a/.github/actions/project-security-report-action/Dockerfile b/.github/actions/project-security-report-action/Dockerfile
@@ -4,17 +4,6 @@ RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y git jq
 
-#RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz && \
-#    HASH=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 && \
-#    echo "$HASH apache-maven-3.6.3-bin.tar.gz" | sha512sum --check --status && \
-#    tar xf apache-maven-3.6.3-bin.tar.gz -C /opt
-
-#ENV M2_HOME="/opt/apache-maven-3.6.3"
-#ENV MAVEN_HOME="/opt/apache-maven-3.6.3"
-#ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
-RUN mvn -version
-
 COPY build_fosstars.sh /opt/build_fosstars.sh
 COPY cleanup_for_config_if_necessary.sh /opt/cleanup_for_config_if_necessary.sh
 COPY entrypoint.sh /opt/entrypoint.sh

diff --git a/src/main/docker/cli/Dockerfile b/src/main/docker/cli/Dockerfile
@@ -1,22 +1,5 @@
-FROM openjdk:8
+FROM sapmachine:17
 
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y git jq
+ADD target/fosstars-github-rating-calc.jar opt/fosstars-github-rating-calc.jar
 
-RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz && \
-    HASH=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 && \
-    echo "$HASH apache-maven-3.6.3-bin.tar.gz" | sha512sum --check --status && \
-    tar xf apache-maven-3.6.3-bin.tar.gz -C /opt
-
-ENV M2_HOME="/opt/apache-maven-3.6.3"
-ENV MAVEN_HOME="/opt/apache-maven-3.6.3"
-ENV PATH="${MAVEN_HOME}/bin:${PATH}"
-
-ADD . /fosstars
-RUN cd /fosstars && mvn package -ntp -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
-
-RUN mkdir /work
-WORKDIR /work
-
-ENTRYPOINT [ "java", "-jar", "/fosstars/target/fosstars-github-rating-calc.jar" ]
+ENTRYPOINT [ "java", "-jar", "opt/fosstars-github-rating-calc.jar" ]