fix: github actions and Jenkinsfile build

jenkinsci · Nov 13, 2024 · e061862 · e061862
1 parent 6a78e9e
commit e061862
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,7 @@ Map branches = [:]
 for (int i = 0; i < platforms.size(); ++i) {
     String label = platforms[i]
     branches[label] = {
-        node("docker && linux-amd64") {
+        node("maven-17") {
             timestamps {
                 ws("platform_${label}_${branchName}_${buildNumber}") {
                     stage('Checkout') {

diff --git a/packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile b/packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile
@@ -14,7 +14,6 @@ ADD packaging-parent-resources /jenkinsfile-runner/packaging-parent-resources
 ADD packaging-parent-pom /jenkinsfile-runner/packaging-parent-pom
 ADD packaging-slim-parent-pom /jenkinsfile-runner/packaging-slim-parent-pom
 ADD pom.xml /jenkinsfile-runner/pom.xml
-ADD .git /jenkinsfile-runner/.git
 RUN cd /jenkinsfile-runner && mvn clean package --batch-mode -ntp --show-version --errors \
   -DargLine="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
 

diff --git a/packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile b/packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile
@@ -14,7 +14,6 @@ ADD packaging-parent-resources /jenkinsfile-runner/packaging-parent-resources
 ADD packaging-parent-pom /jenkinsfile-runner/packaging-parent-pom
 ADD packaging-slim-parent-pom /jenkinsfile-runner/packaging-slim-parent-pom
 ADD pom.xml /jenkinsfile-runner/pom.xml
-ADD .git /jenkinsfile-runner/.git
 RUN cd /jenkinsfile-runner && mvn clean package --batch-mode -ntp --show-version --errors \
   -DargLine="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
 # Prepare the Jenkins core