From 7e87ca50303859bf60bb55684d3bf9fc45be88e0 Mon Sep 17 00:00:00 2001
From: Benjamin Sherriff <bsherriffj@gmail.com>
Date: Mon, 17 Apr 2023 09:44:23 -0400
Subject: [PATCH] v0.1.21 Updated docker files to use amazoncorretto

---
 .version           |  2 +-
 Dockerfile         | 15 +--------------
 Makefile           |  2 +-
 docker-compose.yml |  1 -
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.version b/.version
index 02db736..3c429fc 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-export SIREN_VERSION=0.1.20
\ No newline at end of file
+export SIREN_VERSION=0.1.21
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 72529d6..6cc03b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,10 @@
-FROM ubuntu:22.10
+FROM amazoncorretto:17
 
 ARG VERSION
-ARG JAVA_VERSION
-
-RUN apt-get -y update \
-    && apt-get -y install -y sudo bash curl \
-    && apt-get -y install openjdk-${JAVA_VERSION}-jre-headless
-
-ENV JAVA_VER ${JAVA_VERSION}
-ENV JAVA_HOME /usr/lib/jvm/java-${JAVA_VERSION}-openjdk
 
 WORKDIR /app
 
 ADD https://repo.local.bensherriff.com/artifactory/libs-release/com/bensherriff/siren/${VERSION}/siren-${VERSION}.jar /usr/local/lib/
 RUN mv /usr/local/lib/siren-${VERSION}.jar /usr/local/lib/siren.jar
 
-#COPY ./start.sh ./start.sh
-#RUN chmod +x ./start.sh
-
-#ENTRYPOINT ["tail", "-f", "/dev/null"]
 ENTRYPOINT ["java", "-jar", "/usr/local/lib/siren.jar"]
-#ENTRYPOINT ["/bin/sh", "-c", "./start.sh"]
diff --git a/Makefile b/Makefile
index ab6dbf5..e5df99a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ test:
 	docker run --rm -it siren:latest bash
 
 up:
-	if [[ "$(docker images -q siren 2> /dev/null)" == "" ]]; then docker-compose build; fi; \
+	if [[ ! $$(docker images -q siren 2> /dev/null) ]]; then docker-compose build; fi; \
 	docker-compose up -d
 
 down:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9310f70..3e27ae8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
       context: .
       dockerfile: ./Dockerfile
       args:
-        - JAVA_VERSION=17
         - VERSION=${SIREN_VERSION}
     volumes:
       - ./app:/app