Merge pull request #122 from mecm1993/fix/label

Fix version labels in Dockerfiles
jenkinsci · Dec 27, 2019 · c98c431 · c98c431
2 parents 6b1aecb + 3a9a60f
commit c98c431
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,9 +20,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-FROM jenkins/slave:3.36-1
+ARG version=3.36-1
+FROM jenkins/slave:$version
+
+ARG version
 MAINTAINER Oleg Nenashev <[email protected]>
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.35-2"
+LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
 

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -20,9 +20,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-FROM jenkins/slave:3.36-1-alpine
+ARG version=3.36-1-alpine
+FROM jenkins/slave:$version
+
+ARG version
 MAINTAINER Oleg Nenashev <[email protected]>
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.35-2"
+LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
 

diff --git a/Dockerfile-jdk11 b/Dockerfile-jdk11
@@ -20,9 +20,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-FROM jenkins/slave:3.36-1-jdk11
+ARG version=3.36-1-jdk11
+FROM jenkins/slave:$version
+
+ARG version
 MAINTAINER Oleg Nenashev <[email protected]>
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.35-2"
+LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="$version"
 
 ARG user=jenkins
 

diff --git a/Dockerfile-windows b/Dockerfile-windows
@@ -20,9 +20,12 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-FROM jenkins/agent:latest-windows
+ARG version=latest-windows
+FROM jenkins/agent:$version
+
+ARG version
 MAINTAINER Alex Earl <[email protected]>
-LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="3.29"
+LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols on Windows" Vendor="Jenkins Project" Version="$version"
 
 ARG user=jenkins