From 61450da84a20c898dd2b61655ec1c546a5b67fdb Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Mon, 16 Mar 2020 02:01:07 +0100
Subject: [PATCH] Add Dockerfile and run config, rename hello to
 defaultcontroller

---
 .idea/runConfigurations/Build_Jar.xml         | 21 +++++++++++++++++++
 .../Build_and_Run_on_Docker.xml               | 16 ++++++++++++++
 ...plication.xml => Run_PwgenApplication.xml} |  2 +-
 Dockerfile                                    | 10 +++++++++
 .../DefaultController.java}                   |  6 +++---
 .../de/icaotix/pwgen/PwgenApplication.java    |  3 ++-
 6 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 .idea/runConfigurations/Build_Jar.xml
 create mode 100644 .idea/runConfigurations/Build_and_Run_on_Docker.xml
 rename .idea/runConfigurations/{PwgenApplication.xml => Run_PwgenApplication.xml} (71%)
 create mode 100644 Dockerfile
 rename src/main/java/de/icaotix/{pwgen/HelloController.java => controller/DefaultController.java} (59%)

diff --git a/.idea/runConfigurations/Build_Jar.xml b/.idea/runConfigurations/Build_Jar.xml
new file mode 100644
index 0000000..50f23ee
--- /dev/null
+++ b/.idea/runConfigurations/Build_Jar.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build Jar" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootJar" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build_and_Run_on_Docker.xml b/.idea/runConfigurations/Build_and_Run_on_Docker.xml
new file mode 100644
index 0000000..d18cb20
--- /dev/null
+++ b/.idea/runConfigurations/Build_and_Run_on_Docker.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build and Run on Docker" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="buildCliOptions" value="" />
+        <option name="command" value="" />
+        <option name="containerName" value="pwgen-spring" />
+        <option name="entrypoint" value="" />
+        <option name="imageTag" value="pwgen" />
+        <option name="commandLineOptions" value="-p 80:80" />
+        <option name="sourceFilePath" value="Dockerfile" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/PwgenApplication.xml b/.idea/runConfigurations/Run_PwgenApplication.xml
similarity index 71%
rename from .idea/runConfigurations/PwgenApplication.xml
rename to .idea/runConfigurations/Run_PwgenApplication.xml
index 06ae90c..0d29989 100644
--- a/.idea/runConfigurations/PwgenApplication.xml
+++ b/.idea/runConfigurations/Run_PwgenApplication.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PwgenApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+  <configuration default="false" name="Run PwgenApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="passwordgenerator.main" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="de.icaotix.pwgen.PwgenApplication" />
     <option name="ALTERNATIVE_JRE_PATH" />
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..4906728
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM gradle:jdk11 AS build
+WORKDIR /root
+COPY . .
+RUN ["gradle", "bootJar"]
+
+FROM openjdk:13-jdk-alpine
+WORKDIR /root
+COPY --from=build /root/build/libs/*.jar app.jar
+EXPOSE 80
+ENTRYPOINT ["java","-jar","app.jar"]
\ No newline at end of file
diff --git a/src/main/java/de/icaotix/pwgen/HelloController.java b/src/main/java/de/icaotix/controller/DefaultController.java
similarity index 59%
rename from src/main/java/de/icaotix/pwgen/HelloController.java
rename to src/main/java/de/icaotix/controller/DefaultController.java
index 5406e66..c52f040 100644
--- a/src/main/java/de/icaotix/pwgen/HelloController.java
+++ b/src/main/java/de/icaotix/controller/DefaultController.java
@@ -1,14 +1,14 @@
-package de.icaotix.pwgen;
+package de.icaotix.controller;
 
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @RestController
-public class HelloController {
+public class DefaultController {
 
     @RequestMapping("/")
     public String index() {
-        return "Greetings from Spring Boot!";
+        return "Greetings from Spring Boot, also from a Docker Container!";
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/de/icaotix/pwgen/PwgenApplication.java b/src/main/java/de/icaotix/pwgen/PwgenApplication.java
index 08af5eb..8d7838e 100644
--- a/src/main/java/de/icaotix/pwgen/PwgenApplication.java
+++ b/src/main/java/de/icaotix/pwgen/PwgenApplication.java
@@ -2,8 +2,9 @@ package de.icaotix.pwgen;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"de.icaotix"})
 public class PwgenApplication {
 
 	public static void main(String[] args) {