Update dockerfiles to use new BZ components

sclorg · Jun 14, 2018 · 968ffbb · 968ffbb
1 parent cf6ed7b
commit 968ffbb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/2.3/Dockerfile b/2.3/Dockerfile
@@ -20,7 +20,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby 2.3" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby23,rh-ruby23" \
-      com.redhat.component="rh-ruby23-docker" \
+      com.redhat.component="rh-ruby23-container" \
       name="centos/ruby-23-centos7" \
       version="2.3" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git --context-dir=2.4/test/puma-test-app/ centos/ruby-23-centos7 ruby-sample-app" \

diff --git a/2.3/Dockerfile.rhel7 b/2.3/Dockerfile.rhel7
@@ -20,7 +20,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby 2.3" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby23,rh-ruby23" \
-      com.redhat.component="rh-ruby23-docker" \
+      com.redhat.component="rh-ruby23-container" \
       name="rhscl/ruby-23-rhel7" \
       version="2.3" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git --context-dir=2.4/test/puma-test-app/ rhscl/ruby-23-rhel7 ruby-sample-app" \

diff --git a/2.4/Dockerfile b/2.4/Dockerfile
@@ -20,7 +20,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby 2.4" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby24,rh-ruby24" \
-      com.redhat.component="rh-ruby24-docker" \
+      com.redhat.component="rh-ruby24-container" \
       name="centos/ruby-24-centos7" \
       version="2.4" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git --context-dir=2.4/test/puma-test-app/ centos/ruby-24-centos7 ruby-sample-app" \

diff --git a/2.4/Dockerfile.rhel7 b/2.4/Dockerfile.rhel7
@@ -20,7 +20,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby 2.4" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby24,rh-ruby24" \
-      com.redhat.component="rh-ruby24-docker" \
+      com.redhat.component="rh-ruby24-container" \
       name="rhscl/ruby-24-rhel7" \
       version="2.4" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git --context-dir=2.4/test/puma-test-app/ rhscl/ruby-24-rhel7 ruby-sample-app" \

diff --git a/2.5/Dockerfile b/2.5/Dockerfile
@@ -26,7 +26,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby ${RUBY_VERSION}" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \
-      com.redhat.component="${RUBY_SCL}-docker" \
+      com.redhat.component="${RUBY_SCL}-container" \
       name="${IMAGE_NAME}" \
       version="${RUBY_VERSION}" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \

diff --git a/2.5/Dockerfile.rhel7 b/2.5/Dockerfile.rhel7
@@ -26,7 +26,7 @@ LABEL summary="$SUMMARY" \
       io.k8s.display-name="Ruby ${RUBY_VERSION}" \
       io.openshift.expose-services="8080:http" \
       io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \
-      com.redhat.component="${RUBY_SCL}-docker" \
+      com.redhat.component="${RUBY_SCL}-container" \
       name="${IMAGE_NAME}" \
       version="${RUBY_VERSION}" \
       usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \