Merge pull request #1066 from akram/4.x-update-redhat-label

Update maintainer name and Red Hat build required labels
openshift · Jun 4, 2020 · 0019201 · 0019201
2 parents dd7ed0b + f826759
commit 0019201
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/2/Dockerfile.rhel7 b/2/Dockerfile.rhel7
@@ -11,7 +11,7 @@ RUN go build . && cp go-init /usr/bin
 # Stage 2 : Build slave-base with go-init
 ##############################################
 FROM quay.io/openshift/origin-cli
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 COPY --from=go-init-builder /usr/bin/go-init /usr/bin/go-init
 
 # Jenkins image for OpenShift
@@ -24,7 +24,7 @@ COPY --from=go-init-builder /usr/bin/go-init /usr/bin/go-init
 # Environment:
 # * $JENKINS_PASSWORD - Password for the Jenkins 'admin' user.
 
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 ENV JENKINS_VERSION=2 \
     HOME=/var/lib/jenkins \
@@ -44,13 +44,13 @@ LABEL io.k8s.description="Jenkins is a continuous integration server" \
       io.openshift.tags="jenkins,jenkins2,ci" \
       io.openshift.expose-services="8080:http" \
       io.jenkins.version="2.222.1" \
-      io.openshift.s2i.scripts-url=image:///usr/libexec/s2i
+      io.openshift.s2i.scripts-url=image:///usr/libexec/s2i 
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="openshift-jenkins-2-container" \
-      name="openshift3/jenkins-2-rhel7" \
-      version="4.0" \
-      architecture="x86_64"
+      name="openshift4/jenkins-2-rhel7" \
+      architecture="x86_64 \
+      maintainer="openshift-dev-services+jenkins@redhat.com""
 
 # 8080 for main web interface, 50000 for slave agents
 EXPOSE 8080 50000

diff --git a/agent-maven-3.5/Dockerfile.localdev b/agent-maven-3.5/Dockerfile.localdev
@@ -1,6 +1,6 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:v4.0
 
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 ENV MAVEN_VERSION=3.5 \
     BASH_ENV=/usr/local/bin/scl_enable \

diff --git a/agent-maven-3.5/Dockerfile.rhel7 b/agent-maven-3.5/Dockerfile.rhel7
@@ -1,14 +1,14 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:v4.0
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="jenkins-agent-maven-35-rhel7-container" \
-      name="openshift3/jenkins-agent-maven-35-rhel7" \
-      version="3.11" \
+      name="openshift4/jenkins-agent-maven-35-rhel7" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Agent Maven" \
       io.k8s.description="The jenkins agent maven image has the maven tools on top of the jenkins slave base image." \
-      io.openshift.tags="openshift,jenkins,agent,maven"
+      io.openshift.tags="openshift,jenkins,agent,maven" \
+      maintainer="openshift-dev-services+jenkins@redhat.com"
 
 ENV MAVEN_VERSION=3.5 \
     BASH_ENV=/usr/local/bin/scl_enable \

diff --git a/agent-nodejs-10/Dockerfile.rhel7 b/agent-nodejs-10/Dockerfile.rhel7
@@ -1,15 +1,15 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:v4.0
 
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="jenkins-agent-nodejs-10-rhel7-container" \
       name="openshift4/jenkins-agent-nodejs-10-rhel7" \
-      version="4.4" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Agent Nodejs" \
       io.k8s.description="The jenkins agent nodejs image has the nodejs tools on top of the jenkins slave base image." \
-      io.openshift.tags="openshift,jenkins,agent,nodejs"
+      io.openshift.tags="openshift,jenkins,agent,nodejs" \
+      maintainer="openshift-dev-services+jenkins@redhat.com"
 
 ENV NODEJS_VERSION=10 \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \

diff --git a/agent-nodejs-12/Dockerfile.rhel7 b/agent-nodejs-12/Dockerfile.rhel7
@@ -1,15 +1,15 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:v4.0
 
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="jenkins-agent-nodejs-12-rhel7-container" \
       name="openshift4/jenkins-agent-nodejs-12-rhel7" \
-      version="4.4" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Agent Nodejs" \
       io.k8s.description="The jenkins agent nodejs image has the nodejs tools on top of the jenkins slave base image." \
-      io.openshift.tags="openshift,jenkins,agent,nodejs"
+      io.openshift.tags="openshift,jenkins,agent,nodejs" \
+      maintainer="openshift-dev-services+jenkins@redhat.com"
 
 ENV NODEJS_VERSION=12 \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \

diff --git a/agent-nodejs-8/Dockerfile.rhel7 b/agent-nodejs-8/Dockerfile.rhel7
@@ -1,15 +1,15 @@
 FROM quay.io/openshift/origin-jenkins-agent-base:v4.0
 
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="jenkins-agent-nodejs-8-rhel7-container" \
-      name="openshift3/jenkins-agent-nodejs-8-rhel7" \
-      version="3.6" \
+      name="openshift4/jenkins-agent-nodejs-8-rhel7" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Agent Nodejs" \
       io.k8s.description="The jenkins agent nodejs image has the nodejs tools on top of the jenkins slave base image." \
-      io.openshift.tags="openshift,jenkins,agent,nodejs"
+      io.openshift.tags="openshift,jenkins,agent,nodejs" \
+      maintainer="openshift-dev-services+jenkins@redhat.com"
 
 ENV NODEJS_VERSION=8 \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \

diff --git a/slave-base/Dockerfile.rhel7 b/slave-base/Dockerfile.rhel7
@@ -11,17 +11,18 @@ RUN go build . && cp go-init /usr/bin
 # Stage 2 : Build slave-base with go-init
 ##############################################
 FROM quay.io/openshift/origin-cli
-MAINTAINER Akram Ben Aissi <abenaiss@redhat.com>
+MAINTAINER OpenShift Developer Services <openshift-dev-services+jenkins@redhat.com>
 COPY --from=go-init-builder /usr/bin/go-init /usr/bin/go-init
 
 # Labels consumed by Red Hat build service
 LABEL com.redhat.component="jenkins-slave-base-rhel7-container" \
-      name="openshift3/jenkins-slave-base-rhel7" \
-      version="3.6" \
+      name="openshift4/jenkins-slave-base-rhel7" \
       architecture="x86_64" \
       io.k8s.display-name="Jenkins Slave Base" \
       io.k8s.description="The jenkins slave base image is intended to be built on top of, to add your own tools that your jenkins job needs. The slave base image includes all the jenkins logic to operate as a slave, so users just have to yum install any additional packages their specific jenkins job will need" \
-      io.openshift.tags="openshift,jenkins,slave"
+      io.openshift.tags="openshift,jenkins,slave" \
+      maintainer="openshift-dev-services+jenkins@redhat.com"      
+
 
 ENV HOME=/home/jenkins \
     LANG=en_US.UTF-8 \