From 8ca9d79cab51dd349c304ce9151c0390f9df9993 Mon Sep 17 00:00:00 2001
From: Natasha Stopa <natasha.stopa@gmail.com>
Date: Tue, 9 Apr 2019 11:37:42 -0400
Subject: [PATCH 1/3] [JENKINS-42846] renaming from slave to agent

---
 Dockerfile | 6 +++---
 README.md  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2df49f2a1..7ca7c4e81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,13 +32,13 @@ ARG gid=1000
 ENV HOME /home/${user}
 RUN groupadd -g ${gid} ${group}
 RUN useradd -c "Jenkins user" -d $HOME -u ${uid} -g ${gid} -m ${user}
-LABEL Description="This is a base image, which provides the Jenkins agent executable (slave.jar)" Vendor="Jenkins project" Version="${VERSION}"
+LABEL Description="This is a base image, which provides the Jenkins agent executable (agent.jar)" Vendor="Jenkins project" Version="${VERSION}"
 
 ARG AGENT_WORKDIR=/home/${user}/agent
 
-RUN curl --create-dirs -fsSLo /usr/share/jenkins/slave.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
+RUN curl --create-dirs -fsSLo /usr/share/jenkins/agent.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
   && chmod 755 /usr/share/jenkins \
-  && chmod 644 /usr/share/jenkins/slave.jar
+  && chmod 644 /usr/share/jenkins/agent.jar
 
 USER ${user}
 ENV AGENT_WORKDIR=${AGENT_WORKDIR}
diff --git a/README.md b/README.md
index 629531c0b..653773415 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Jenkins Agent Docker image
 [![Docker Pulls](https://img.shields.io/docker/pulls/jenkins/slave.svg)](https://hub.docker.com/r/jenkins/slave/)
 [![Docker Automated build](https://img.shields.io/docker/automated/jenkins/slave.svg)](https://hub.docker.com/r/jenkins/slave/)
 
-This is a base image for Docker, which includes OpenJDK 8 and the Jenkins agent executable (slave.jar).
+This is a base image for Docker, which includes OpenJDK 8 and the Jenkins agent executable (agent.jar).
 This executable is an instance of the [Jenkins Remoting library](https://github.com/jenkinsci/remoting).
 
 ## Usage
@@ -16,7 +16,7 @@ In that image, the container is launched externally and attaches to Jenkins.
 This image may instead be used to launch an agent using the **Launch method** of **Launch agent via execution of command on the master**. Try for example
 
 ```sh
-docker run -i --rm --name agent --init jenkins/slave java -jar /usr/share/jenkins/slave.jar
+docker run -i --rm --name agent --init jenkins/slave java -jar /usr/share/jenkins/agent.jar
 ```
 
 after setting **Remote root directory** to `/home/jenkins/agent`.
@@ -29,7 +29,7 @@ which provides logging by default and change the JAR Caching behavior.
 Call example:
 
 ```sh
-docker run -i --rm --name agent1 --init -v agent1-workdir:/home/jenkins/agent jenkins/slave java -jar /usr/share/jenkins/slave.jar -workDir /home/jenkins/agent
+docker run -i --rm --name agent1 --init -v agent1-workdir:/home/jenkins/agent jenkins/slave java -jar /usr/share/jenkins/agent.jar -workDir /home/jenkins/agent
 ```
 
 ## Configurations

From 8bc39d1dbc7cf5aa9f8cf05e4acc6f8d3bf3d788 Mon Sep 17 00:00:00 2001
From: stopalopa <stopalopa@users.noreply.github.com>
Date: Tue, 4 Jun 2019 11:56:32 -0700
Subject: [PATCH 2/3] Update Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 7ca7c4e81..f3c1ba28c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,7 @@ ARG AGENT_WORKDIR=/home/${user}/agent
 RUN curl --create-dirs -fsSLo /usr/share/jenkins/agent.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
   && chmod 755 /usr/share/jenkins \
   && chmod 644 /usr/share/jenkins/agent.jar
+RUN ln -sf /usr/share/jenkins/slave.jar /usr/share/jenkins/agent.jar
 
 USER ${user}
 ENV AGENT_WORKDIR=${AGENT_WORKDIR}

From ec65c0437a31065d680786a5f630f6750ff73543 Mon Sep 17 00:00:00 2001
From: Alex Earl <slide.o.mix@gmail.com>
Date: Tue, 6 Aug 2019 08:11:04 -0700
Subject: [PATCH 3/3] Fix download file name

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 365a26979..9cfa16368 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,7 +38,7 @@ ARG AGENT_WORKDIR=/home/${user}/agent
 
 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list
 RUN apt-get update && apt-get install -t stretch-backports git-lfs
-RUN curl --create-dirs -fsSLo /usr/share/jenkins/slave.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
+RUN curl --create-dirs -fsSLo /usr/share/jenkins/agent.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
   && chmod 755 /usr/share/jenkins \
   && chmod 644 /usr/share/jenkins/agent.jar \
   && ln -sf /usr/share/jenkins/slave.jar /usr/share/jenkins/agent.jar