Change docker setting

Author: koda-masaru

.bowerrc

@@ -1,3 +1,4 @@
 {
-  "directory" : "src/main/webapp/bower"
+  "directory" : "src/main/webapp/bower",
+  "allow_root": true
 }

.dockerignore

@@ -7,6 +7,8 @@ docker-compose.yml
 
 target/
 
+tomcat.8080/
+
 .idea/
 .postgres/
 .settings/

.travis.yml

@@ -1,5 +1,5 @@
 language: java
 jdk: oraclejdk8
 
-install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.exec.skip=true -B -V
+install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dskip.npm=true -Dskip.bower=true -Dskip.gulp=true -B -V
 script: mvn clean test

Dockerfile

@@ -1,32 +1,38 @@
 version: '2.1'
 
 services:
-  dev:
-    image: knowledge
-    build:
-      context: .
-      args:
-        - https_proxy
-        - http_proxy
+  maven:
+    image: maven:3.5-jdk-8-slim
+    command: mvn -v
+    environment:
+      KNOWLEDGE_TEST_MAIL: 'false'
+      MAVEN_CONFIG: /var/maven/.m2
+      https_proxy: ${https_proxy}
+      http_proxy: ${http_proxy}
+    working_dir: /usr/src/mymaven/
+    entrypoint: ''
+    volumes:
+      - $PWD:/usr/src/mymaven
+      - $PWD/.m2:/root/.m2
+
+  tomcat:
+    image: tomcat:8.5-jre8-alpine
     ports:
       - 8080:8080
       - 8009:8009
     expose:
       - 8080
-    links:
-      - mailcatcher
-      - postgres
-      - elasticsearch
-      - kibana
+#    links:
+#      - mailcatcher
+#      - postgres
+#      - elasticsearch
+#      - kibana
     environment:
-      KNOWLEDGE_TEST_MAIL: 'false'
       https_proxy: ${https_proxy}
       http_proxy: ${http_proxy}
     volumes:
-      - $PWD:/usr/src/mymaven
-      - $PWD/.m2:/root/.m2
       - $PWD/.knowledge:/root/.knowledge
-      - $PWD/target/knowledge.war:/usr/local/tomcat/webapps/knowledge.war
+      - $PWD/target/ROOT.war:/usr/local/tomcat/webapps/ROOT.war
 
   mailcatcher:
     image: zolweb/docker-mailcatcher

docker-compose.yml

@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+
+docker-compose run --rm maven mvn install -DskipTests=true -Dmaven.javadoc.skip=true -e
+# docker-compose run --rm maven mvn clean test site -e
+docker-compose run --rm maven mvn clean package -e
+
+mv target/knowledge.war target/ROOT.war
+
+docker-compose run --rm knowledge rm -rf /usr/local/tomcat/webapps/*
+docker-compose run --rm knowledge ls /usr/local/tomcat/webapps
+docker-compose up --build -d knowledge
+docker-compose logs -f knowledge