Skip to content

Commit

Permalink
Moved from springboot to java
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgemoralespou committed Jul 26, 2016
1 parent 8e5ddf8 commit 6727b76
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 789 deletions.
149 changes: 0 additions & 149 deletions .sti/bin/assemble

This file was deleted.

10 changes: 0 additions & 10 deletions .sti/bin/run

This file was deleted.

10 changes: 0 additions & 10 deletions .sti/bin/save-artifacts

This file was deleted.

12 changes: 0 additions & 12 deletions .sti/bin/usage

This file was deleted.

10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# springboot-sti
# s2i-java
FROM openshift/base-centos7
MAINTAINER Jorge Morales <[email protected]>

Expand Down Expand Up @@ -30,17 +30,17 @@ ENV PATH=/opt/maven/bin/:/opt/gradle/bin/:$PATH

ENV BUILDER_VERSION 1.0

LABEL io.k8s.description="Platform for building Spring Boot applications with maven or gradle" \
io.k8s.display-name="Spring Boot builder 1.0" \
LABEL io.k8s.description="Platform for building Java (fatjar) applications with maven or gradle" \
io.k8s.display-name="Java S2I builder 1.0" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="builder,maven-3,gradle-2.6,springboot"
io.openshift.tags="builder,maven-3,gradle-2.6,java,microservices,fatjar"

# TODO (optional): Copy the builder files into /opt/openshift
# COPY ./<builder_folder>/ /opt/openshift/
# COPY Additional files,configurations that we want to ship by default, like a default setting.xml

LABEL io.openshift.s2i.scripts-url=image:///usr/local/sti
COPY ./.sti/bin/ /usr/local/sti
COPY ./sti/bin/ /usr/local/sti

RUN chown -R 1001:1001 /opt/openshift

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

IMAGE_NAME = springboot-sti
IMAGE_NAME = s2i-java

build:
docker build -t $(IMAGE_NAME) .
Expand Down
12 changes: 7 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
== OpenShift S2I Builder for Spring Boot
This Source-to-Image Builder let's you create projects targetting Spring Boot and built with:
== OpenShift S2I Builder for Java
This Source-to-Image Builder let's you create projects targetting Java OpenJDK 8 and built with:

* maven
* gradle
NOTE: If a project has a pom.xml and a build.gradle, maven will take precedence

This builder/runtime s2i image can be used with SpringBoot, Vert.X, Wildfly Swarm, DropWizard and many other microservices frameworks.

== BUILD ENV Options

* *APP_SUFFIX*: Jar file suffix to use to locate the generated artifact to use (e.g. xxxxx${APP_SUFFIX}.jar)
Expand Down Expand Up @@ -36,13 +38,13 @@ BUILDER_ARGS="build -x test"
* First load all the needed resources in a project.

----
oc create -f https://raw.githubusercontent.com/jorgemoralespou/springboot-s2i/master/ose3/springboot-s2i-imagestream.json
oc create -f https://raw.githubusercontent.com/jorgemoralespou/s2i-java/master/ose3/s2i-java-imagestream.json
----

* Once the builder springboot-s2i has been registered, you can create an app with:
* Once the builder s2i-java has been registered, you can create an app with:

** Instant app already provided as template
** Using the springboot-s2i builder image using a regular Git repository
** Using the s2i-java builder image using a regular Git repository

== Samples
There is a lot of example SpringBoot applications https://github.com/spring-projects/spring-boot/tree/master/spring-boot-samples[here]
Loading

0 comments on commit 6727b76

Please sign in to comment.