fixed

shiyindaxiaojie · Sep 26, 2023 · 3b98d01 · 3b98d01
1 parent 90c165b
commit 3b98d01
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 51 deletions.
diff --git a/.coding/Jenkinsfile b/.coding/Jenkinsfile
@@ -1,16 +1,24 @@
 pipeline {
   agent any
-  environment {
-    MAVEN_SNAPSHOTS_NAME = "maven-snapshots"
-    MAVEN_SNAPSHOTS_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_SNAPSHOTS_NAME}"
+	environment {
+	  MAVEN_SNAPSHOTS_NAME = "maven-snapshots"
+		MAVEN_SNAPSHOTS_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_SNAPSHOTS_NAME}"
     MAVEN_SNAPSHOTS_URL = "${CCI_CURRENT_WEB_PROTOCOL}://${CCI_CURRENT_TEAM}-maven.pkg.${CCI_CURRENT_DOMAIN}/repository/${PROJECT_NAME}/${MAVEN_SNAPSHOTS_NAME}/"
 
-    MAVEN_RELEASES_NAME = "maven-releases"
-    MAVEN_RELEASES_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_RELEASES_NAME}"
+	  MAVEN_RELEASES_NAME = "maven-releases"
+		MAVEN_RELEASES_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_RELEASES_NAME}"
     MAVEN_RELEASES_URL = "${CCI_CURRENT_WEB_PROTOCOL}://${CCI_CURRENT_TEAM}-maven.pkg.${CCI_CURRENT_DOMAIN}/repository/${PROJECT_NAME}/${MAVEN_RELEASES_NAME}/"
 
-    DOCKER_RELEASES_URL = "mengxiangge-docker.pkg.coding.net/github/docker-releases/${DEPOT_NAME}"
-  }
+	  MAVEN_SNAPSHOTS_NAME = "maven-snapshots"
+	  MAVEN_RELEASES_NAME = "maven-releases"
+	  DOCKER_REPOSITORY_NAME = "docker"
+
+		MAVEN_SNAPSHOTS_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_SNAPSHOTS_NAME}"
+		MAVEN_SNAPSHOTS_URL = "${CCI_CURRENT_WEB_PROTOCOL}://${CCI_CURRENT_TEAM}-maven.pkg.${CCI_CURRENT_DOMAIN}/repository/${PROJECT_NAME}/${MAVEN_SNAPSHOTS_NAME}/"
+		MAVEN_RELEASES_ID = "${CCI_CURRENT_TEAM}-${PROJECT_NAME}-${MAVEN_RELEASES_NAME}"
+		MAVEN_RELEASES_URL = "${CCI_CURRENT_WEB_PROTOCOL}://${CCI_CURRENT_TEAM}-maven.pkg.${CCI_CURRENT_DOMAIN}/repository/${PROJECT_NAME}/${MAVEN_RELEASES_NAME}/"
+	  DOCKER_REPOSITORY = "${CCI_CURRENT_TEAM}-docker.pkg.${CCI_CURRENT_DOMAIN}/${PROJECT_NAME}/${DOCKER_REPOSITORY_NAME}"
+	}
   stages {
     stage('检出') {
       steps {
@@ -34,51 +42,82 @@ pipeline {
           }
         }
         withCredentials([
-          usernamePassword(
-            credentialsId: env.MAVEN_RELEASES,
-            usernameVariable: 'MAVEN_RELEASES_USERNAME',
-            passwordVariable: 'MAVEN_RELEASES_PASSWORD'
-          ),
-          usernamePassword(
-            credentialsId: env.MAVEN_SNAPSHOTS,
-            usernameVariable: 'MAVEN_SNAPSHOTS_USERNAME',
-            passwordVariable: 'MAVEN_SNAPSHOTS_PASSWORD'
-          )
-        ]) {
-          withEnv([
-            "ARTIFACT_VERSION=${ARTIFACT_VERSION}",
-            "MAVEN_RELEASES_ID=${MAVEN_RELEASES_ID}",
-            "MAVEN_RELEASES_URL=${MAVEN_RELEASES_URL}",
-            "MAVEN_RELEASES_USERNAME=${MAVEN_RELEASES_USERNAME}",
-            "MAVEN_RELEASES_PASSWORD=${MAVEN_RELEASES_PASSWORD}",
-            "MAVEN_SNAPSHOTS_ID=${MAVEN_SNAPSHOTS_ID}",
-            "MAVEN_SNAPSHOTS_URL=${MAVEN_SNAPSHOTS_URL}",
-            "MAVEN_SNAPSHOTS_USERNAME=${MAVEN_SNAPSHOTS_USERNAME}",
-            "MAVEN_SNAPSHOTS_PASSWORD=${MAVEN_SNAPSHOTS_PASSWORD}"
-          ]) {
-            sh 'mvn -T 4C -Pcoding versions:set -DnewVersion=${ARTIFACT_VERSION} package -DskipTests -s ./.coding/settings.xml'
-          }
-        }
+					usernamePassword(
+						credentialsId: env.MAVEN_RELEASES,
+						usernameVariable: 'MAVEN_RELEASES_USERNAME',
+						passwordVariable: 'MAVEN_RELEASES_PASSWORD'
+					),
+					usernamePassword(
+						credentialsId: env.MAVEN_SNAPSHOTS,
+						usernameVariable: 'MAVEN_SNAPSHOTS_USERNAME',
+						passwordVariable: 'MAVEN_SNAPSHOTS_PASSWORD'
+					)
+				]) {
+					withEnv([
+						"ARTIFACT_VERSION=${ARTIFACT_VERSION}",
+						"MAVEN_RELEASES_ID=${MAVEN_RELEASES_ID}",
+						"MAVEN_RELEASES_URL=${MAVEN_RELEASES_URL}",
+						"MAVEN_RELEASES_USERNAME=${MAVEN_RELEASES_USERNAME}",
+						"MAVEN_RELEASES_PASSWORD=${MAVEN_RELEASES_PASSWORD}",
+						"MAVEN_SNAPSHOTS_ID=${MAVEN_SNAPSHOTS_ID}",
+						"MAVEN_SNAPSHOTS_URL=${MAVEN_SNAPSHOTS_URL}",
+						"MAVEN_SNAPSHOTS_USERNAME=${MAVEN_SNAPSHOTS_USERNAME}",
+						"MAVEN_SNAPSHOTS_PASSWORD=${MAVEN_SNAPSHOTS_PASSWORD}"
+					]) {
+						sh 'mvn -T 4C -U -Pcoding versions:set -DnewVersion=${ARTIFACT_VERSION} package -DskipTests -s ./.coding/settings.xml'
+					}
+				}
       }
     }
-    stage('推送到 Docker 制品库') {
-      steps {
-        withCredentials([
-          usernamePassword(
-            credentialsId: env.DOCKER_RELEASES,
-            usernameVariable: 'DOCKER_USERNAME',
-            passwordVariable: 'DOCKER_PASSWORD'
-          )
-        ]) {
-          withEnv([
-            "DOCKER_USERNAME=${DOCKER_USERNAME}",
-            "DOCKER_PASSWORD=${DOCKER_PASSWORD}",
-            "DOCKER_IMAGE=${DOCKER_RELEASES_URL}:${ARTIFACT_VERSION}"
-          ]) {
-            sh 'mvn -T 4C -Pcoding jib:build -Djib.disableUpdateChecks=true -DskipTests -s ./.coding/settings.xml'
-          }
-        }
-      }
+    stage('推送到 Maven 制品库') {
+			steps {
+				withCredentials([
+					usernamePassword(
+						credentialsId: env.MAVEN_RELEASES,
+						usernameVariable: 'MAVEN_RELEASES_USERNAME',
+						passwordVariable: 'MAVEN_RELEASES_PASSWORD'
+					),
+					usernamePassword(
+						credentialsId: env.MAVEN_SNAPSHOTS,
+						usernameVariable: 'MAVEN_SNAPSHOTS_USERNAME',
+						passwordVariable: 'MAVEN_SNAPSHOTS_PASSWORD'
+					)
+				]) {
+					withEnv([
+						"MAVEN_RELEASES_ID=${MAVEN_RELEASES_ID}",
+						"MAVEN_RELEASES_URL=${MAVEN_RELEASES_URL}",
+						"MAVEN_RELEASES_USERNAME=${MAVEN_RELEASES_USERNAME}",
+						"MAVEN_RELEASES_PASSWORD=${MAVEN_RELEASES_PASSWORD}",
+						"MAVEN_SNAPSHOTS_ID=${MAVEN_SNAPSHOTS_ID}",
+						"MAVEN_SNAPSHOTS_URL=${MAVEN_SNAPSHOTS_URL}",
+						"MAVEN_SNAPSHOTS_USERNAME=${MAVEN_SNAPSHOTS_USERNAME}",
+						"MAVEN_SNAPSHOTS_PASSWORD=${MAVEN_SNAPSHOTS_PASSWORD}"
+					]) {
+						sh 'mvn -T 4C -Pcoding deploy -DskipTests -s ./.coding/settings.xml'
+					}
+				}
+			}
+		}
+		stage('推送到 Docker 制品库') {
+			steps {
+				withCredentials([
+					usernamePassword(
+						credentialsId: env.DOCKER_REGISTRY_CREDENTIALS_ID,
+						usernameVariable: 'DOCKER_USERNAME',
+						passwordVariable: 'DOCKER_PASSWORD'
+					)
+				]) {
+					withEnv([
+						"DOCKER_USERNAME=${DOCKER_USERNAME}",
+						"DOCKER_PASSWORD=${DOCKER_PASSWORD}"
+					]) {
+						sh "docker login ${DOCKER_REPOSITORY} -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}"
+						sh "docker build -t ${DOCKER_REPOSITORY}/${DEPOT_NAME}:${ARTIFACT_VERSION} -f docker/Dockerfile ."
+						sh "docker push ${DOCKER_REPOSITORY}/${DEPOT_NAME}:${ARTIFACT_VERSION}"
+						sh "docker push ${DOCKER_REPOSITORY}/${DEPOT_NAME}:latest"
+					}
+				}
+			}
+		}
 	}
-  }
 }
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -22,6 +22,7 @@ ARG USER=tmpuser
 ARG GROUP=tmpgroup
 ARG HOME=/app
 ARG LOG=$HOME/logs
+ENV WORKDIR $HOME
 ENV START_DELAY_SECS 1
 ENV JVM_DEBUG "n"
 ENV JVM_XMS "1g"