From fc85c95bb1a146a84278804980d58c6c7adf3245 Mon Sep 17 00:00:00 2001 From: pwatson1 Date: Wed, 18 Apr 2018 23:40:43 -0400 Subject: [PATCH 1/3] Commit with docker file and docker-compose --- pom.xml | 61 +++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index d7ae738..826a4e6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.zipcode.transcurrency Transcurrency 0.0.1-SNAPSHOT - jar + war Transcurrency Transfer money with friends @@ -34,6 +34,11 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-tomcat + provided + com.h2database @@ -87,6 +92,13 @@ spring-boot-starter-test test + + + org.hamcrest + hamcrest-core + 1.3 + test + org.mockito @@ -101,61 +113,16 @@ 4.12 test - - javax.inject - javax.inject - 1 - - - org.mockito - mockito-core - - - org.junit.jupiter - junit-jupiter-api - RELEASE - - - javax.inject - javax.inject - 1 - javax.inject javax.inject 1 - - junit - junit - test - org.junit.jupiter junit-jupiter-api RELEASE - - junit - junit - test - - - org.springframework.boot - spring-boot-starter-test - test - - - junit - junit - test - - - junit - junit - 4.12 - test - From e48a60c61872609e67f235ed5d5a1afa45d024a4 Mon Sep 17 00:00:00 2001 From: pwatson1 Date: Thu, 19 Apr 2018 11:29:49 -0400 Subject: [PATCH 2/3] Commit with docker file and docker-compose update. Update UserController and TranscurrencyApplication --- .../artifacts/Transcurrency_war_exploded.xml | 16 ++++----- .idea/misc.xml | 5 ++- Dockerfile | 20 +++++++++++ docker-compose.yml | 33 ++++++++++++------- .../TranscurrencyApplication.java | 3 ++ .../controllers/UserController.java | 2 +- 6 files changed, 55 insertions(+), 24 deletions(-) diff --git a/.idea/artifacts/Transcurrency_war_exploded.xml b/.idea/artifacts/Transcurrency_war_exploded.xml index 358d1d5..e0e9d4c 100644 --- a/.idea/artifacts/Transcurrency_war_exploded.xml +++ b/.idea/artifacts/Transcurrency_war_exploded.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$/classes/artifacts/Transcurrency_war_exploded + $PROJECT_DIR$/target/Transcurrency-0.0.1-SNAPSHOT @@ -41,10 +41,6 @@ - - - - @@ -76,16 +72,16 @@ - - - - + - + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index d30d09e..fe001fb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + + - + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b0db246..8cc10e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -159,3 +159,23 @@ RUN set -e \ EXPOSE 8080 CMD ["catalina.sh", "run"] + + +# FROM openjdk +# COPY . /usr/src/tcwork +# WORKDIR /usr/src/tcwork +# EXPOSE 8080 +# RUN javac ./src/main/java/com/zipcode/transcurrency/Transcurrency/TranscurrencyApplication.java +#CMD ["mvn", "spring-boot:run"] +# CMD ["java", "-cp", "./com.zipcode.transcurrency.Transcurrency.TranscurrencyApplication.java"] + + +# RUN javac TranscurrencyApplication.java +# CMD ["java", "TranscurrencyApplication"] +# RUN ["mvn", "spring-boot"] + +# RUN apk add --no-cache openjdk +# COPY . /usr/local/tomcat/tcwork +# EXPOSE 80 +# WORKDIR /usr/local/tomcat/tcwork +# CMD ["java", "TranscurrencyApplication.java" ] diff --git a/docker-compose.yml b/docker-compose.yml index d0a27a7..1f04cff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,24 +1,33 @@ -version: '3.5' +version: '3.6' + services: tc-tomcat: - image: tomcat:9.0.4-jre9 - build: . + build: + context: . + dockerfile: Dockerfile ports: - - "8090:8080" + - "8080:8080" + volumes: - - ./classes/artifacts/Transcurrency_war_exploded:/usr/local/tomcat/conf/Transcurrency_war_exploded - type: bind - source: ./logback - target: /usr/local/tomcat/logs + source: ./artifacts/tcweb.war + target: /usr/local/tomcat/webapps + restart: on-failure + tc-data: - image: mysql:5.7.21 - build: . + image: mysql + volumes: - type: bind - source: ./target/classes/application-mysqldev.yml + source: ./src/main/resources/application-mysqldev.yml target: /usr/local/data/application-mysqldev.yml restart: always environment: - MYSQL_ROOT_PASSWORD: + MYSQL_ROOT_PASSWORD: root + MYSQL_USER: transcurrencymysql_dev_user + MYSQL_PASSWORD: yoo + depends_on: + - tc-tomcat ports: - - "3306:3366" \ No newline at end of file + - "3306" + diff --git a/src/main/java/com/zipcode/transcurrency/Transcurrency/TranscurrencyApplication.java b/src/main/java/com/zipcode/transcurrency/Transcurrency/TranscurrencyApplication.java index 785ad4c..fc8e7a5 100644 --- a/src/main/java/com/zipcode/transcurrency/Transcurrency/TranscurrencyApplication.java +++ b/src/main/java/com/zipcode/transcurrency/Transcurrency/TranscurrencyApplication.java @@ -42,6 +42,8 @@ protected void configure(HttpSecurity http) throws Exception { http.exceptionHandling().accessDeniedPage("/403"); http.csrf().disable(); http.headers().frameOptions().disable(); + + //http.servletApi(). } public static void main(String[] args) { @@ -51,4 +53,5 @@ public static void main(String[] args) { logger.debug("This is a debug log."); SpringApplication.run(TranscurrencyApplication.class, args); } + } diff --git a/src/main/java/com/zipcode/transcurrency/Transcurrency/controllers/UserController.java b/src/main/java/com/zipcode/transcurrency/Transcurrency/controllers/UserController.java index b2e9953..363e76c 100644 --- a/src/main/java/com/zipcode/transcurrency/Transcurrency/controllers/UserController.java +++ b/src/main/java/com/zipcode/transcurrency/Transcurrency/controllers/UserController.java @@ -11,7 +11,7 @@ import java.util.List; @RestController -public class UserController { +public class UserController { private final Logger LOG = LoggerFactory.getLogger(UserController.class); From aa1104f56967be1bf7dbfd87d1259bd44c0540b8 Mon Sep 17 00:00:00 2001 From: pwatson1 Date: Thu, 19 Apr 2018 12:24:08 -0400 Subject: [PATCH 3/3] Commit artifact updates and Manifest --- .idea/artifacts/Transcurrency_war.xml | 8 +++ .idea/artifacts/tcweb.xml | 92 +++++++++++++++++++++++++ WEB-INF/web.xml | 6 ++ src/main/resources/META-INF/MANIFEST.MF | 5 ++ 4 files changed, 111 insertions(+) create mode 100644 .idea/artifacts/Transcurrency_war.xml create mode 100644 .idea/artifacts/tcweb.xml create mode 100644 WEB-INF/web.xml create mode 100644 src/main/resources/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/Transcurrency_war.xml b/.idea/artifacts/Transcurrency_war.xml new file mode 100644 index 0000000..392c60f --- /dev/null +++ b/.idea/artifacts/Transcurrency_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/tcweb.xml b/.idea/artifacts/tcweb.xml new file mode 100644 index 0000000..b036d83 --- /dev/null +++ b/.idea/artifacts/tcweb.xml @@ -0,0 +1,92 @@ + + + $PROJECT_DIR$/artifacts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..2b672fd --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Class-Path: C:\Program Files\Java\jdk-9.0.4\bin +Main-Class: com.zipcode.transcurrency.Transcurrency.TranscurrencyAppli + cation +