From 5d68840a3e77bc21b176c656a4d645e5c6b70cd6 Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Thu, 27 Apr 2023 10:42:11 +0800 Subject: [PATCH 1/7] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f..ef04358b 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,8 +14,8 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'szsky' + GITHUB_ACCOUNT = 'xicka' APP_NAME = 'devops-java-sample' } From 2603742584a3b150994123592c53bbc58c11f507 Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Fri, 28 Apr 2023 16:37:02 +0800 Subject: [PATCH 2/7] Update Dockerfile-on-prem --- Dockerfile-on-prem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-on-prem b/Dockerfile-on-prem index 69dc369d..e27d1182 100644 --- a/Dockerfile-on-prem +++ b/Dockerfile-on-prem @@ -1,4 +1,4 @@ -FROM harbor.devops.kubesphere.local:30280/library/java:openjdk-8-jre-alpine +FROM openjdk:8-jre WORKDIR /home From f8e4832762826a41a884ef342448e6c1bed717fe Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Fri, 28 Apr 2023 16:37:31 +0800 Subject: [PATCH 3/7] Update Dockerfile-online --- Dockerfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-online b/Dockerfile-online index 9e99459f..bdb83a8b 100644 --- a/Dockerfile-online +++ b/Dockerfile-online @@ -1,4 +1,4 @@ -FROM java:openjdk-8-jre-alpine +FROM openjdk:8-jre WORKDIR /home From b4e9dec52e785f388e9db46af9fe278b79555bbd Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Sat, 29 Apr 2023 14:41:20 +0800 Subject: [PATCH 4/7] Update Dockerfile-on-prem --- Dockerfile-on-prem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-on-prem b/Dockerfile-on-prem index e27d1182..69dc369d 100644 --- a/Dockerfile-on-prem +++ b/Dockerfile-on-prem @@ -1,4 +1,4 @@ -FROM openjdk:8-jre +FROM harbor.devops.kubesphere.local:30280/library/java:openjdk-8-jre-alpine WORKDIR /home From 7b34998e80e00a5d2f2943c2ca85f05fb6885878 Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Sat, 29 Apr 2023 14:42:13 +0800 Subject: [PATCH 5/7] Update Dockerfile-online --- Dockerfile-online | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-online b/Dockerfile-online index bdb83a8b..9e99459f 100644 --- a/Dockerfile-online +++ b/Dockerfile-online @@ -1,4 +1,4 @@ -FROM openjdk:8-jre +FROM java:openjdk-8-jre-alpine WORKDIR /home From 4fbd942c638d3c2260ea554e8bd039d8613c643d Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Thu, 4 May 2023 16:12:35 +0800 Subject: [PATCH 6/7] update sonar-token --- Jenkinsfile-online | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index ef04358b..fd101a72 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -17,6 +17,7 @@ pipeline { DOCKERHUB_NAMESPACE = 'szsky' GITHUB_ACCOUNT = 'xicka' APP_NAME = 'devops-java-sample' + SONAR_CREDENTIAL_ID = 'sonar-token' } stages { From 009563f60d8e8c8e667f3b50c49bf7fc4fbfbf05 Mon Sep 17 00:00:00 2001 From: xicka <1620767686@qq.com> Date: Thu, 4 May 2023 17:18:20 +0800 Subject: [PATCH 7/7] Update Dockerfile-online --- Dockerfile-online | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile-online b/Dockerfile-online index 9e99459f..67d22cea 100644 --- a/Dockerfile-online +++ b/Dockerfile-online @@ -1,4 +1,5 @@ -FROM java:openjdk-8-jre-alpine +# FROM java:openjdk-8-jre-alpine +From openjdk:8-jre-alpine WORKDIR /home