From 76d315724773dee550ba5a5035ad3823cd8ab127 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 10:26:48 +0200 Subject: [PATCH 01/15] travis push to dockerhub --- .travis.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51c40faf..e28f2031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,19 @@ before_install: - sudo apt-get -qq update - sudo apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn - sudo apt-get -y -q install haveged && sudo service haveged start +after_success: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - export REPO=sismics/docs + - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` + - docker build -f Dockerfile -t $REPO:$COMMIT . + - docker tag $REPO:$COMMIT $REPO:$TAG + - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER + - docker push $REPO env: global: - - TESSDATA_PREFIX=/usr/share/tesseract-ocr - - LC_NUMERIC=C \ No newline at end of file + - TESSDATA_PREFIX=/usr/share/tesseract-ocr + - LC_NUMERIC=C + - secure: LRGpjWORb0qy6VuypZjTAfA8uRHlFUMTwb77cenS9PPRBxuSnctC531asS9Xg3DqC5nsRxBBprgfCKotn5S8nBSD1ceHh84NASyzLSBft3xSMbg7f/2i7MQ+pGVwLncusBU6E/drnMFwZBleo+9M8Tf96axY5zuUp90MUTpSgt0= + - secure: bCDDR6+I7PmSkuTYZv1HF/z98ANX/SFEESUCqxVmV5Gs0zFC0vQXaPJQ2xaJNRop1HZBFMZLeMMPleb0iOs985smpvK2F6Rbop9Tu+Vyo0uKqv9tbZ7F8Nfgnv9suHKZlL84FNeUQZJX6vsFIYPEJ/r7K5P/M0PdUy++fEwxEhU= + - secure: ewXnzbkgCIHpDWtaWGMa1OYZJ/ki99zcIl4jcDPIC0eB3njX/WgfcC6i0Ke9mLqDqwXarWJ6helm22sNh+xtQiz6isfBtBX+novfRt9AANrBe3koCMUemMDy7oh5VflBaFNP0DVb8LSCnwf6dx6ZB5E9EB8knvk40quc/cXpGjY= + - COMMIT=${TRAVIS_COMMIT::8} From 60021e512341e830ffa6ca378ab61d34f3730216 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 10:39:58 +0200 Subject: [PATCH 02/15] build prod package before pushing to dockerhub --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e28f2031..6415cfd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ before_install: - sudo apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn - sudo apt-get -y -q install haveged && sudo service haveged start after_success: - - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - mvn -Pprod -DskipTests clean install + - docker login -u $DOCKER_USER -p $DOCKER_PASS - export REPO=sismics/docs - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` - docker build -f Dockerfile -t $REPO:$COMMIT . From 6b0106e3850a09343f4900b11bbc5ce9b7dafc82 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 11:09:18 +0200 Subject: [PATCH 03/15] update readme with docker instructions --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d2f9eb4f..0228e56a 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,16 @@ Download -------- The latest release is downloadable here: in WAR format. -You will need a Java webapp server to run it, like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/) +You will need a Java webapp server to run it, like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/). +The default admin password is "admin". Don't forget to change it before going to production. + +Install with Docker +------------------- + +From a Docker host, run this command to download and install Sismics Docs. The server will run on . +The default admin password is "admin". Don't forget to change it before going to production. + + docker run --rm --name sismics_docs_latest -d -p 8100:8080 -v sismics_docs_latest:/data sismics/docs:latest How to build Docs from the sources ---------------------------------- From c352b94b38e55a3e50f68b165b2a02eec800a53f Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:25:20 +0200 Subject: [PATCH 04/15] Closes #126: click to copy --- .../webapp/src/app/docs/controller/document/DocumentView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js index 1c1ce194..c8615295 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js @@ -100,7 +100,8 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta var title = 'Shared document'; var msg = 'You can share this document by giving this link. ' + 'Note that everyone having this link can see the document.
' + - ''; + ''; var btns = [ {result: 'unshare', label: 'Unshare', cssClass: 'btn-danger'}, {result: 'close', label: 'Close'} From e38bdbe50801106e34961ec2e26bf51a460a5458 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:27:24 +0200 Subject: [PATCH 05/15] Closes #128: Delete cursor on comment delete button --- docs-web/src/main/webapp/src/partial/docs/document.view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index 3e94f557..8525d2eb 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -107,7 +107,7 @@

{{ comment.content }}
{{ comment.create_date | date: 'yyyy-MM-dd' }} - Delete

From 5f7d2f2a685bbc876b059376e1de036486fdf206 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:31:59 +0200 Subject: [PATCH 06/15] Closes #129: bigger checkbox --- .../src/main/webapp/src/partial/docs/document.default.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html index c15b146b..dd0a6aca 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.default.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html @@ -10,9 +10,9 @@ -
+
- +
From cbfa4b1c417c8932cf707feab35facbf47a3acb8 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:32:55 +0200 Subject: [PATCH 07/15] Closes #127: Edit -> Save --- docs-web/src/main/webapp/src/partial/docs/document.edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html index 68fca1e4..30e9fc9b 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html @@ -129,7 +129,7 @@
- +
From 3274b4c79ae2b520cc91bc0c2466d2359e8762a4 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:34:21 +0200 Subject: [PATCH 08/15] Closes #130: Fix document language icon --- docs-web/src/main/webapp/src/partial/docs/document.view.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index 8525d2eb..017c0b1e 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -40,9 +40,10 @@