Merge pull request #115 from eyalzek/master

Add the executable flag to `jenkins-agent` binary (regression in 3.25-3)
jenkinsci · Sep 20, 2019 · 903d31b · 903d31b
2 parents be6a2c1 + ba0ce87
commit 903d31b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,8 @@ ARG user=jenkins
 
 USER root
 COPY jenkins-agent /usr/local/bin/jenkins-agent
-RUN ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
+RUN chmod +x /usr/local/bin/jenkins-agent &&\
+    ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
 USER ${user}
 
 ENTRYPOINT ["jenkins-agent"]
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -28,7 +28,8 @@ ARG user=jenkins
 
 USER root
 COPY jenkins-agent /usr/local/bin/jenkins-agent
-RUN ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
+RUN chmod +x /usr/local/bin/jenkins-agent &&\
+    ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
 USER ${user}
 
 ENTRYPOINT ["jenkins-slave"]
diff --git a/Dockerfile-jdk11 b/Dockerfile-jdk11
@@ -28,7 +28,8 @@ ARG user=jenkins
 
 USER root
 COPY jenkins-agent /usr/local/bin/jenkins-agent
-RUN ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
+RUN chmod +x /usr/local/bin/jenkins-agent &&\
+    ln -s /usr/local/bin/jenkins-agent /usr/local/bin/jenkins-slave
 USER ${user}
 
 ENTRYPOINT ["jenkins-slave"]