From c690448cb7f84d72032a54e88c46168c69bf30d9 Mon Sep 17 00:00:00 2001
From: Benjamin Sherriff <bsherriffj@gmail.com>
Date: Thu, 19 Jan 2023 12:10:08 -0500
Subject: [PATCH] Reorganize Dockerfile

---
 Dockerfile | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56919e2..51445f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,25 @@
 ARG JAVA_VERSION=17
-
-FROM alpine:3.16 AS build
-
 ARG MAVEN_VERSION=3.8.7
-ARG MAVEN_BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
-ARG USER_HOME_DIR="/root"
+
+FROM alpine:3.16 as builder
+
 ARG JAVA_VERSION
 
-RUN apk --no-cache add sudo curl tar bash procps \
+RUN apk --no-cache add sudo bash \
   && apk --no-cache add openjdk${JAVA_VERSION}
 
+##########
+# BUILD 1
+##########
+FROM builder AS build1
+
+ARG MAVEN_VERSION
+ARG JAVA_VERSION
+ARG MAVEN_BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG USER_HOME_DIR="/root"
+
+RUN apk --no-cache add curl tar procps
+
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
     && echo "Downloading maven" \
     && curl -fsSL -o /tmp/apache-maven.tar.gz ${MAVEN_BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
@@ -29,21 +39,19 @@ COPY ./src ./src
 COPY ./pom.xml ./pom.xml
 RUN mvn -f ./pom.xml clean package
 
-FROM alpine:3.16
+FROM builder as build2
 
 ARG JAVA_VERSION
 
-ENV VERSION ${VER}
 ENV JAVA_VER ${JAVA_VERSION}
 ENV JAVA_HOME /usr/lib/jvm/java-${JAVA_VERSION}-openjdk
 
-RUN apk --no-cache add sudo bash \
-  && apk --no-cache add openjdk${JAVA_VERSION}
+RUN ln -s /lib/libc.musl-aarch64.so.1 /lib/ld-linux-aarch64.so.2
 
 WORKDIR /app
 COPY --from=build /app/target/siren-*-All.jar /usr/local/lib/siren.jar
-COPY ./start.sh ./start.sh
-RUN chmod +x ./start.sh
+#COPY ./start.sh ./start.sh
+#RUN chmod +x ./start.sh
 
 ENTRYPOINT ["java", "-jar", "/usr/local/lib/siren.jar"]
 #ENTRYPOINT ["/bin/sh", "-c", "./start.sh"]
\ No newline at end of file