Merge pull request #933 from support-project/develop

Release v1.11.0

.dockerignore

@@ -0,0 +1,9 @@
+.dockerignore
+Dockerfile
+docker-compose.yml
+
+.git/
+.gitignore/
+
+target/
+

.gitignore

@@ -6,3 +6,6 @@ target
 .eclipse-pmd
 .checkstyle
 node
+.idea
+.m2
+knowledge.iml

.travis.yml

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

Dockerfile

@@ -0,0 +1,71 @@
+FROM node:8.6-alpine
+
+# Default to UTF-8 file.encoding
+ENV LANG C.UTF-8
+
+# install git
+RUN apk update && apk upgrade && \
+    apk add --no-cache bash git openssh
+
+# install jdk
+RUN { \
+        echo '#!/bin/sh'; \
+        echo 'set -e'; \
+        echo; \
+        echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
+    } > /usr/local/bin/docker-java-home \
+    && chmod +x /usr/local/bin/docker-java-home
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin
+
+ENV JAVA_VERSION 8u131
+ENV JAVA_ALPINE_VERSION 8.131.11-r2
+
+RUN set -x \
+    && apk add --no-cache \
+        openjdk8="$JAVA_ALPINE_VERSION" \
+    && [ "$JAVA_HOME" = "$(docker-java-home)" ]
+
+# install maven
+RUN apk add --no-cache curl tar bash
+
+ARG MAVEN_VERSION=3.5.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+  && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha256sum -c - \
+  && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven.tar.gz \
+  && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+
+VOLUME "$USER_HOME_DIR/.m2"
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
+
+# RUN knowledge tool install
+RUN npm install -g bower
+RUN npm install -g gulp
+
+COPY package.json /usr/src/mymaven/
+COPY bower.json /usr/src/mymaven/
+COPY .bowerrc /usr/src/mymaven/
+
+WORKDIR /usr/src/mymaven
+
+RUN npm install
+RUN bower install --allow-root
+
+
+#### RUN on docker-compose 
+# docker-compose build dev
+# docker-compose run --rm dev mvn clean test

README.md

@@ -5,7 +5,12 @@
 
 ## About
 - Free Knowledge Management System
+- [landing page and Online manual](https://information-knowledge.support-project.org/)
 
+## Support
+- **日本語での質問は、以下のサイトに登録してください(海外からのアクセスが多くなったため)**
+- **For questions in Japanese, please register below**
+- https://service-knowledge.support-project.org/
 
 ## Live Demo
 - [https://test-knowledge.support-project.org](https://test-knowledge.support-project.org)
@@ -23,13 +28,3 @@
 ## How to initial set up
 - Please show the [wiki page](https://github.com/support-project/knowledge/wiki)
 
-
-## Project website (more info)
-- [landing page and Online manual](https://information-knowledge.support-project.org/)
-
-
-
-
-
-
-

Third_party_license.txt

@@ -202,5 +202,11 @@
    - License: [BSD License] https://github.com/kpdecker/jsdiff/blob/master/LICENSE
    - project-url: https://github.com/kpdecker/jsdiff
 
+- Chart.js
+   - License: [MIT License] https://github.com/chartjs/Chart.js/blob/master/LICENSE.md
+   - project-url: https://github.com/chartjs/Chart.js
 
+- Vue.js
+   - License: [MIT License] https://github.com/vuejs/vue/blob/master/LICENSE
+   - project-url: https://jp.vuejs.org/index.html
 

bower.json

@@ -35,7 +35,9 @@
     "bootstrap-table": "1.11.1",
     "tableExport.jquery.plugin": "1.8.1",
     "diff2html": "2.3.0",
-    "jsdiff": "3.2.0"
+    "jsdiff": "3.2.0",
+    "chart.js": "2.6.0",
+    "vue": "2.4.2"
   },
   "devDependencies": {},
   "resolutions": {

docker-compose.yml

@@ -0,0 +1,25 @@
+version: '2.1'
+
+services:
+  dev:
+    image: knowledge-maven
+    build:
+      context: .
+      args:
+        - https_proxy
+        - http_proxy
+    links:
+        - mailcatcher
+    environment:
+      KNOWLEDGE_TEST_MAIL: 'false'
+    volumes:
+      - $PWD:/usr/src/mymaven
+      - $PWD/.m2:/root/.m2
+
+  mailcatcher:
+    image: "zolweb/docker-mailcatcher"
+    ports:
+      - "1025:1025"
+      - "1080:1080"
+    expose:
+      - "1080"