Skip to content

Commit

Permalink
Updated for centosplus repo
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgemoralespou committed Mar 7, 2016
1 parent c6efaf4 commit ff323ec
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ MAINTAINER Jorge Morales <[email protected]>

# 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 && \
Expand Down
14 changes: 7 additions & 7 deletions springboot-sti-all.json → springboot-s2i-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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",
Expand All @@ -50,7 +50,7 @@
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "springboot-sti:latest"
"name": "springboot-s2i:latest"
}
},
"resources": {}
Expand All @@ -70,7 +70,7 @@
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "springboot-sti"
"name": "springboot-s2i"
},
"spec": {
"dockerImageRepository": "",
Expand Down Expand Up @@ -188,7 +188,7 @@
"sourceStrategy": {
"from": {
"kind": "ImageStreamTag",
"name": "springboot-sti:latest"
"name": "springboot-s2i:latest"
}
}
},
Expand Down Expand Up @@ -426,7 +426,7 @@
"sourceStrategy": {
"from": {
"kind": "ImageStreamTag",
"name": "springboot-sti:latest"
"name": "springboot-s2i:latest"
}
}
},
Expand Down

0 comments on commit ff323ec

Please sign in to comment.