From 0adbed56ecf051ace304821fde2fdf4d4a39096a Mon Sep 17 00:00:00 2001
From: ye4241 <6803102+ye4241@users.noreply.github.com>
Date: Tue, 16 Apr 2024 13:58:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=BC=96=E8=AF=91=E9=95=9C=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BC=96=E8=AF=91=E5=92=8C=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile     | 22 +++++++++++++---------
 build.sh       |  1 +
 dockerbuild.sh |  7 -------
 run.sh         |  2 ++
 4 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 build.sh
 delete mode 100755 dockerbuild.sh
 create mode 100644 run.sh

diff --git a/Dockerfile b/Dockerfile
index 10e6d49..b59e72e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,17 @@
+FROM ibm-semeru-runtimes:open-21-jdk as build
+ENV MAVEN_VENSION=3.9.6
+RUN apt-get update && apt-get install -y curl
+RUN curl -fsSL https://archive.apache.org/dist/maven/maven-3/${MAVEN_VENSION}/binaries/apache-maven-${MAVEN_VENSION}-bin.tar.gz -o /tmp/apache-maven-${MAVEN_VENSION}-bin.tar.gz && \
+    tar -xzf /tmp/apache-maven-${MAVEN_VENSION}-bin.tar.gz -C /opt && \
+    ln -s /opt/apache-maven-${MAVEN_VENSION}/bin/mvn /usr/local/bin/mvn
+WORKDIR /app
+COPY . .
+RUN mvn clean package
+
 FROM ibm-semeru-runtimes:open-21-jre
-
-ADD target/Jetbrains-Help.jar /Jetbrains-Help.jar
-
-RUN bash -c 'touch /Jetbrains-Help.jar'
-
+WORKDIR /app
+COPY --from=build /app/target/Jetbrains-Help.jar Jetbrains-Help.jar
 ENV TZ=Asia/Shanghai
 RUN ln -sf /usr/share/zoneinfo/{TZ} /etc/localtime && echo "{TZ}" > /etc/timezone
-
-
 EXPOSE 10768
-
-ENTRYPOINT ["java", "-jar","/Jetbrains-Help.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-jar", "Jetbrains-Help.jar"]
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..3251e7e
--- /dev/null
+++ b/build.sh
@@ -0,0 +1 @@
+docker build -t jetbrains-help .
\ No newline at end of file
diff --git a/dockerbuild.sh b/dockerbuild.sh
deleted file mode 100755
index 407895f..0000000
--- a/dockerbuild.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-## chmod u+x *.sh
-# please run me ↑
-mvn clean package
-
-docker build -t jenkins-help .
-
-docker run -d -p 10768:10768 --name jetbrains-help jenkins-help
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..d43e1bc
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,2 @@
+docker remove jetbrains-help
+docker run -d -p 10768:10768 --name jetbrains-help jetbrains-help
\ No newline at end of file

From 67b861f253afd7ffc8871fcd5b2d45205d14e42c Mon Sep 17 00:00:00 2001
From: ye4241 <6803102+ye4241@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:06:03 +0800
Subject: [PATCH 2/2] Update Dockerfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

替换docker中的maven为官方镜像
---
 Dockerfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b59e72e..2eeabe5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,4 @@
-FROM ibm-semeru-runtimes:open-21-jdk as build
-ENV MAVEN_VENSION=3.9.6
-RUN apt-get update && apt-get install -y curl
-RUN curl -fsSL https://archive.apache.org/dist/maven/maven-3/${MAVEN_VENSION}/binaries/apache-maven-${MAVEN_VENSION}-bin.tar.gz -o /tmp/apache-maven-${MAVEN_VENSION}-bin.tar.gz && \
-    tar -xzf /tmp/apache-maven-${MAVEN_VENSION}-bin.tar.gz -C /opt && \
-    ln -s /opt/apache-maven-${MAVEN_VENSION}/bin/mvn /usr/local/bin/mvn
+FROM maven:3-ibm-semeru-21-jammy as build
 WORKDIR /app
 COPY . .
 RUN mvn clean package