From 8dcdee122a1818a2da0fba4e122d90282a82ba34 Mon Sep 17 00:00:00 2001
From: GuangJie1 <guangjiebai@gmail.com>
Date: Tue, 4 Jun 2024 10:02:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bisheng-jdk=EF=BC=9Abuild=20bisheng-jdk=20i?=
 =?UTF-8?q?mage=20for=20version=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile | 30 ++++++++++++++++++++++
 bisheng-jdk/1.8.0/22.03-lts/Dockerfile     | 30 ++++++++++++++++++++++
 bisheng-jdk/README.md                      |  2 ++
 bisheng-jdk/doc/image-info.yml             |  2 ++
 bisheng-jdk/meta.yml                       |  4 +++
 5 files changed, 68 insertions(+)
 create mode 100644 bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
 create mode 100644 bisheng-jdk/1.8.0/22.03-lts/Dockerfile

diff --git a/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
new file mode 100644
index 00000000..71c02a32
--- /dev/null
+++ b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp3
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=8u412
+
+ENV JAVA_HOME=/usr/lib/jvm/java-openjdk-${VERSION}
+ENV PATH=$JAVA_HOME/bin:$PATH
+ENV LANG C.UTF-8
+ENV JAVA_VERSION=1.8.0_412-b11
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi; \
+    curl -fSL -o bisheng-jdk.tar.gz https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_jdk/bisheng-jdk-${VERSION}-linux-${BUILDARCH}.tar.gz; \
+    mkdir -p ${JAVA_HOME}; \
+    tar -xvf bisheng-jdk.tar.gz -C ${JAVA_HOME} --strip-components=1; \
+    rm -f bisheng-jdk.tar.gz
+  
+RUN rm -rf "$JAVA_HOME/jre/lib/security/cacerts"; \
+    ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/jre/lib/security/cacerts"; \
+    alternatives --install /usr/bin/java java "$JAVA_HOME/bin/java" 20000; \
+    alternatives --install /usr/bin/javac javac "$JAVA_HOME/bin/javac" 20000; \
+    javac -version; \
+    java -version
+
+CMD ["java"]
diff --git a/bisheng-jdk/1.8.0/22.03-lts/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
new file mode 100644
index 00000000..da9ddc0d
--- /dev/null
+++ b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
@@ -0,0 +1,30 @@
+ARG BASE=openeuler/openeuler:22.03-lts
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=8u412
+
+ENV JAVA_HOME=/usr/lib/jvm/java-openjdk-${VERSION}
+ENV PATH=$JAVA_HOME/bin:$PATH
+ENV LANG C.UTF-8
+ENV JAVA_VERSION=1.8.0_412-b11
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi; \
+    curl -fSL -o bisheng-jdk.tar.gz https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_jdk/bisheng-jdk-${VERSION}-linux-${BUILDARCH}.tar.gz; \
+    mkdir -p ${JAVA_HOME}; \
+    tar -xvf bisheng-jdk.tar.gz -C ${JAVA_HOME} --strip-components=1; \
+    rm -f bisheng-jdk.tar.gz
+
+RUN rm -rf "$JAVA_HOME/jre/lib/security/cacerts"; \
+    ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/jre/lib/security/cacerts"; \
+    alternatives --install /usr/bin/java java "$JAVA_HOME/bin/java" 20000; \
+    alternatives --install /usr/bin/javac javac "$JAVA_HOME/bin/javac" 20000; \
+    javac -version; \
+    java -version
+
+CMD ["java"]
diff --git a/bisheng-jdk/README.md b/bisheng-jdk/README.md
index 249c11e9..02dde60c 100644
--- a/bisheng-jdk/README.md
+++ b/bisheng-jdk/README.md
@@ -24,6 +24,8 @@ docker run -it --name openjdk openeuler/bisheng-jdk:{TAG}
 
 # Supported tags and respective Dockerfile links
 
+- 1.8.0-oe2203lts: BiSheng JDK 1.8.0, openEuler 22.03 LTS
+- 1.8.0-oe2203sp3: BiSheng JDK 1.8.0, openEuler 22.03 LTS SP3
 - 17.0.10-oe2203sp3: BiSheng JDK 17.0.10, openEuler 22.03 LTS SP3
 
 ## Operating System
diff --git a/bisheng-jdk/doc/image-info.yml b/bisheng-jdk/doc/image-info.yml
index a7a1729c..52892edc 100644
--- a/bisheng-jdk/doc/image-info.yml
+++ b/bisheng-jdk/doc/image-info.yml
@@ -11,6 +11,8 @@ tags: |
 
   |    Tag   |  Currently  |   Architectures  |
   |----------|-------------|------------------|
+  |[1.8.0-oe2203lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/bisheng-jdk/1.8.0/22.03-lts/Dockerfile)| BiSheng JDK 1.8.0 on openEuler 22.03-LTS | amd64, arm64 |
+  |[1.8.0-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile)| BiSheng JDK 1.8.0 on openEuler 22.03-LTS-SP3 | amd64, arm64 |
   |[17.0.10-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/bisheng-jdk/17.0.10/22.03-lts-sp3/Dockerfile)| BiSheng JDK 17.0.10 on openEuler 22.03-LTS-SP3 | amd64, arm64 |
 
   注意，以下`{Tag}`的值按照需求，替换为上述表格中的tag内容。
diff --git a/bisheng-jdk/meta.yml b/bisheng-jdk/meta.yml
index e45b38cc..59d29077 100644
--- a/bisheng-jdk/meta.yml
+++ b/bisheng-jdk/meta.yml
@@ -1,2 +1,6 @@
+1.8.0-oe2203lts:
+  bisheng-jdk/1.8.0/22.03-lts/Dockerfile
+1.8.0-oe2203sp3:
+  bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
 17.0.10-oe2203sp3:
   bisheng-jdk/17.0.10/22.03-lts-sp3/Dockerfile
\ No newline at end of file
-- 
Gitee


From 5a892fc3af8d4e73be801620fcde759ca6f86960 Mon Sep 17 00:00:00 2001
From: GuangJie1 <guangjiebai@gmail.com>
Date: Tue, 4 Jun 2024 10:05:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bisheng-jdk=EF=BC=9Akeep=20the=20same=20for?=
 =?UTF-8?q?mat=20=20for=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile | 6 +++---
 bisheng-jdk/1.8.0/22.03-lts/Dockerfile     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
index 71c02a32..188e2ae5 100644
--- a/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
+++ b/bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile
@@ -5,10 +5,10 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=8u412
 
-ENV JAVA_HOME=/usr/lib/jvm/java-openjdk-${VERSION}
-ENV PATH=$JAVA_HOME/bin:$PATH
+ENV JAVA_HOME /usr/lib/jvm/java-openjdk-${VERSION}
+ENV PATH $JAVA_HOME/bin:$PATH
 ENV LANG C.UTF-8
-ENV JAVA_VERSION=1.8.0_412-b11
+ENV JAVA_VERSION 1.8.0_412-b11
 
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x64"; \
diff --git a/bisheng-jdk/1.8.0/22.03-lts/Dockerfile b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
index da9ddc0d..72da01e3 100644
--- a/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
+++ b/bisheng-jdk/1.8.0/22.03-lts/Dockerfile
@@ -5,10 +5,10 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=8u412
 
-ENV JAVA_HOME=/usr/lib/jvm/java-openjdk-${VERSION}
-ENV PATH=$JAVA_HOME/bin:$PATH
+ENV JAVA_HOME /usr/lib/jvm/java-openjdk-${VERSION}
+ENV PATH $JAVA_HOME/bin:$PATH
 ENV LANG C.UTF-8
-ENV JAVA_VERSION=1.8.0_412-b11
+ENV JAVA_VERSION 1.8.0_412-b11
 
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x64"; \
-- 
Gitee