From ff323ec74325aeb709545c8a798acbdb75b27f28 Mon Sep 17 00:00:00 2001
From: jorgemoralespou <jorgemoralespou@gmail.com>
Date: Mon, 7 Mar 2016 13:32:04 +0100
Subject: [PATCH] Updated for centosplus repo

---
 Dockerfile                                         |  5 +++--
 springboot-sti-all.json => springboot-s2i-all.json | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)
 rename springboot-sti-all.json => springboot-s2i-all.json (98%)

diff --git a/Dockerfile b/Dockerfile
index ba2981b..5e9fcff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,9 @@ MAINTAINER Jorge Morales <jmorales@redhat.com>
 
 # Install build tools on top of base image
 # Java jdk 8, Maven 3.3, Gradle 2.6
-RUN yum install -y --enablerepo=centosplus \
-    tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel && \
+RUN INSTALL_PKGS="tar unzip bc which lsof java-1.8.0-openjdk java-1.8.0-openjdk-devel" && \
+    yum install -y --enablerepo=centosplus $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
     yum clean all -y && \
     mkdir -p /opt/openshift && \
     mkdir -p /opt/app-root/source && chmod -R a+rwX /opt/app-root/source && \
diff --git a/springboot-sti-all.json b/springboot-s2i-all.json
similarity index 98%
rename from springboot-sti-all.json
rename to springboot-s2i-all.json
index 398c4f4..36c6794 100644
--- a/springboot-sti-all.json
+++ b/springboot-s2i-all.json
@@ -2,14 +2,14 @@
    "kind": "List",
    "apiVersion": "v1",
    "metadata": {
-      "name": "springboot-sti"
+      "name": "springboot-s2i"
    },
    "items": [
       {
          "kind": "BuildConfig",
          "apiVersion": "v1",
          "metadata": {
-            "name": "springboot-sti"
+            "name": "springboot-s2i"
          },
          "spec": {
             "triggers": [
@@ -36,7 +36,7 @@
                   "uri": "https://github.com/jorgemoralespou/osev3-examples.git",
                   "ref": "master"
                },
-               "contextDir": "spring-boot/springboot-sti"
+               "contextDir": "spring-boot/springboot-s2i"
             },
             "strategy": {
                "type": "Docker",
@@ -50,7 +50,7 @@
             "output": {
                "to": {
                   "kind": "ImageStreamTag",
-                  "name": "springboot-sti:latest"
+                  "name": "springboot-s2i:latest"
                }
             },
             "resources": {}
@@ -70,7 +70,7 @@
          "kind": "ImageStream",
          "apiVersion": "v1",
          "metadata": {
-            "name": "springboot-sti"
+            "name": "springboot-s2i"
          },
          "spec": {
             "dockerImageRepository": "",
@@ -188,7 +188,7 @@
                      "sourceStrategy": {
                         "from": {
                            "kind": "ImageStreamTag",
-                           "name": "springboot-sti:latest"
+                           "name": "springboot-s2i:latest"
                         }
                      }
                   },
@@ -426,7 +426,7 @@
                      "sourceStrategy": {
                         "from": {
                            "kind": "ImageStreamTag",
-                           "name": "springboot-sti:latest"
+                           "name": "springboot-s2i:latest"
                         }
                      }
                   },