updating boot hello to 1.0

vamosraghava · Feb 3, 2020 · ea7bffa · ea7bffa
1 parent 283e149
commit ea7bffa
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/hello/springboot/Dockerfile b/hello/springboot/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:8u151
-ENV JAVA_APP_JAR boot-demo-0.0.1.jar
+ENV JAVA_APP_JAR boot-demo-1.0.0.jar
 WORKDIR /app/
 COPY target/$JAVA_APP_JAR .
 EXPOSE 8080

diff --git a/hello/springboot/Dockerfile.openshift b/hello/springboot/Dockerfile.openshift
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift
 WORKDIR /work/
-ENV JAVA_APP_JAR boot-demo-0.0.1.jar
+ENV JAVA_APP_JAR boot-demo-1.0.0.jar
 # the following is not needed on this Red Hat created image
 # RUN chgrp -R 0 /work && \ 
 #    chmod -R g=u /work

diff --git a/hello/springboot/Dockerfile_Java11 b/hello/springboot/Dockerfile_Java11
@@ -1,5 +1,5 @@
 FROM openjdk:11
-ENV JAVA_APP_JAR boot-demo-0.0.1.jar
+ENV JAVA_APP_JAR boot-demo-1.0.0.jar
 WORKDIR /app/
 COPY target/$JAVA_APP_JAR .
 EXPOSE 8080

diff --git a/hello/springboot/Dockerfile_Memory b/hello/springboot/Dockerfile_Memory
@@ -1,5 +1,5 @@
 FROM openjdk:8u151
-ENV JAVA_APP_JAR boot-demo-0.0.1.jar
+ENV JAVA_APP_JAR boot-demo-1.0.0.jar
 WORKDIR /app/
 COPY target/$JAVA_APP_JAR .
 EXPOSE 8080

diff --git a/hello/springboot/Dockerfile_Memory2 b/hello/springboot/Dockerfile_Memory2
@@ -1,5 +1,5 @@
 FROM openjdk:8
-ENV JAVA_APP_JAR boot-demo-0.0.1.jar
+ENV JAVA_APP_JAR boot-demo-1.0.0.jar
 WORKDIR /app/
 COPY target/$JAVA_APP_JAR .
 EXPOSE 8080

diff --git a/hello/springboot/pom.xml b/hello/springboot/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.burrsutter</groupId>
 	<artifactId>boot-demo</artifactId>
-	<version>0.0.1</version>
+	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>helloboot</name>

diff --git a/hello/springboot/readme.txt b/hello/springboot/readme.txt
@@ -1,30 +1,29 @@
-Intial pom.xml created by start.spring.io
+Initial pom.xml created by start.spring.io
 
 mvn clean compile package
 
-java -jar target/boot-demo-0.0.1.jar
+java -jar target/boot-demo-1.0.0.jar
 or
 mvn spring-boot:run
 curl http://localhost:8080/
 ctrl-c
 
 Manual Deployment
 
-docker build -f Dockerfile -t dev.local/burrsutter/boot-demo:0.0.1 .
+docker build -f Dockerfile -t dev.local/burrsutter/boot-demo:1.0.0 .
 or 
-docker build -f Dockerfile.openshift -t dev.local/burrsutter/boot-demo:0.0.1 .
+docker build -f Dockerfile.openshift -t dev.local/burrsutter/boot-demo:1.0.0 .
 
 docker login docker.io
 docker images | grep boot-demo
-docker tag $1 docker.io/burrsutter/boot-demo:0.0.1
-docker push docker.io/burrsutter/boot-demo:0.0.1
-or
-docker login quay.io
-docker images | grep boot-demo
-docker tag $1 quay.io/burrsutter/boot-demo:0.0.1
-docker push quay.io/burrsutter/boot-demo:0.0.1
 
+docker tag $1 docker.io/burrsutter/boot-demo:1.0.0
+docker push docker.io/burrsutter/boot-demo:1.0.0
 
+or
 
+docker login quay.io
+docker images | grep boot-demo
 
-http://jshift.io/
+docker tag $1 quay.io/burrsutter/boot-demo:1.0.0
+docker push quay.io/burrsutter/boot-demo:1.0.0
diff --git a/hello/springboot/src/main/java/com/burrsutter/MyRESTController.java b/hello/springboot/src/main/java/com/burrsutter/MyRESTController.java
@@ -23,7 +23,7 @@ public class MyRESTController {
 
    @RequestMapping("/")
    public String sayHello() {
-       greeting = environment.getProperty("GREETING","Aloha");
+       greeting = environment.getProperty("GREETING","Hej");
        count++;
        System.out.println(greeting + " from " + hostname + " " + count);
        return greeting + " from Spring Boot! " + count + " on " + hostname + "\n";