From 244f3d44f674189a5331f8ad0e2b6fa0a628ab69 Mon Sep 17 00:00:00 2001
From: Wenjie Guo <wguo@redhat.com>
Date: Wed, 22 Jan 2025 11:34:44 +0800
Subject: [PATCH 1/3] Add dockerfile

---
 .dockerignore           |  3 ++-
 images/Dockerfile       | 33 +++++++++++++++++++++++++++++++++
 images/start-service.sh |  9 +++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 images/Dockerfile
 create mode 100644 images/start-service.sh

diff --git a/.dockerignore b/.dockerignore
index 94810d0..ab7d686 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,4 +2,5 @@
 !target/*-runner
 !target/*-runner.jar
 !target/lib/*
-!target/quarkus-app/*
\ No newline at end of file
+!target/quarkus-app/*
+!images/*
\ No newline at end of file
diff --git a/images/Dockerfile b/images/Dockerfile
new file mode 100644
index 0000000..64772f6
--- /dev/null
+++ b/images/Dockerfile
@@ -0,0 +1,33 @@
+FROM registry.access.redhat.com/ubi9/openjdk-11:1.21-1 AS builder
+
+ARG GIT_REVISION=main
+
+USER root
+
+RUN microdnf install -y git-core && microdnf clean all
+
+WORKDIR /workspace
+
+RUN git init && \
+    git clone -b ${GIT_REVISION} --depth 1 https://github.com/Commonjava/indy-generic-proxy-service.git
+
+RUN cd indy-generic-proxy-service && \
+    mvn package -Dquarkus.package.type=uber-jar
+
+FROM registry.access.redhat.com/ubi9/openjdk-11-runtime:1.21-1
+
+USER root
+
+RUN mkdir -p /deployment/log /deployment/config && \
+  chmod -R 777 /deployment/log /deployment/config
+
+COPY --from=builder /workspace/indy-generic-proxy-service/target/*-runner.jar /deployment/indy-generic-proxy-service-runner.jar
+RUN chmod +r /deployment/indy-generic-proxy-service-runner.jar
+
+COPY images/start-service.sh /deployment/start-service.sh
+RUN chmod +x /deployment/*
+
+WORKDIR /
+
+ENTRYPOINT ["bash", "-c"]
+CMD ["/deployment/start-service.sh"]
\ No newline at end of file
diff --git a/images/start-service.sh b/images/start-service.sh
new file mode 100644
index 0000000..f3bc53c
--- /dev/null
+++ b/images/start-service.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo "Hello! Indy Generic Proxy Service starts!"
+
+export JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
+export JAVA_CMD=$JAVA_HOME/bin/java
+
+cd /deployment
+$JAVA_CMD $JAVA_OPTS -jar ./indy-generic-proxy-service-runner.jar
\ No newline at end of file

From 0f53952d8ec1a807b1d3d86488bb94ad8965dacc Mon Sep 17 00:00:00 2001
From: Wenjie Guo <wguo@redhat.com>
Date: Wed, 22 Jan 2025 15:54:27 +0800
Subject: [PATCH 2/3] Use copy instead of git clone

---
 .dockerignore     |  4 +++-
 images/Dockerfile | 10 +++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ab7d686..8d76c9e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,6 @@
 !target/*-runner.jar
 !target/lib/*
 !target/quarkus-app/*
-!images/*
\ No newline at end of file
+!images/*
+!pom.xml
+!src/main/*
\ No newline at end of file
diff --git a/images/Dockerfile b/images/Dockerfile
index 64772f6..044200e 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -4,15 +4,11 @@ ARG GIT_REVISION=main
 
 USER root
 
-RUN microdnf install -y git-core && microdnf clean all
-
 WORKDIR /workspace
 
-RUN git init && \
-    git clone -b ${GIT_REVISION} --depth 1 https://github.com/Commonjava/indy-generic-proxy-service.git
+COPY ./ .
 
-RUN cd indy-generic-proxy-service && \
-    mvn package -Dquarkus.package.type=uber-jar
+RUN mvn package -Dquarkus.package.type=uber-jar
 
 FROM registry.access.redhat.com/ubi9/openjdk-11-runtime:1.21-1
 
@@ -21,7 +17,7 @@ USER root
 RUN mkdir -p /deployment/log /deployment/config && \
   chmod -R 777 /deployment/log /deployment/config
 
-COPY --from=builder /workspace/indy-generic-proxy-service/target/*-runner.jar /deployment/indy-generic-proxy-service-runner.jar
+COPY --from=builder /workspace/target/*-runner.jar /deployment/indy-generic-proxy-service-runner.jar
 RUN chmod +r /deployment/indy-generic-proxy-service-runner.jar
 
 COPY images/start-service.sh /deployment/start-service.sh

From 3fe4417fac4c7a2aefc0311957f5d7d8348f6f08 Mon Sep 17 00:00:00 2001
From: Wenjie Guo <wguo@redhat.com>
Date: Wed, 22 Jan 2025 16:11:22 +0800
Subject: [PATCH 3/3] Remove the unused arg

---
 images/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/images/Dockerfile b/images/Dockerfile
index 044200e..ca5aed2 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -1,7 +1,5 @@
 FROM registry.access.redhat.com/ubi9/openjdk-11:1.21-1 AS builder
 
-ARG GIT_REVISION=main
-
 USER root
 
 WORKDIR /workspace