From 281a5939cf4e39b8b689f6e6e834159b9ed9e789 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Fri, 30 Sep 2016 16:15:46 +0200
Subject: [PATCH] update readme + circle.yml captain version

---
 README.md  | 25 +++----------------------
 circle.yml |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 60095de01..c71663ba6 100644
--- a/README.md
+++ b/README.md
@@ -2,34 +2,15 @@
 
 [![License](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)](https://www.gnu.org/licenses/agpl-3.0.html)
 
-## Usage in development environment
+## Usage
 
-* Build and run the project (including clean target): `./go.sh`
-* Build the project (including clean target): `./build.sh`
-* Run the project: `./run.sh`
-* Show live logs: `./log.sh` (CTRL+C to quit)
-* Stop and remove the running container: `./halt.sh`
-* Clean Maven cache, etc: `./clean.sh`
-
-## Usage in building environment
-
-* Build a versioned image: `./captain_build.sh` (only if `$WORKSPACE=$(pwd)`) or `export WORKSPACE=<path-to-workspace> && captain build`
-* Build and test an image: `./captain_test.sh` or `captain test`
-* Run the latest image with a non-persistent postgres (only use this for testing purpose): `./captain_run.sh`
+* Build a versioned image: `./build.sh`
+* Build and test an image: `./test.sh`
 
 ## Deployment
 
 * See here: https://hub.docker.com/r/hbpmip/portal-backend/
 
-## Generate PDF API documentation on build
-
-Uncomment the following line in src/docker/build/build-in-docker.sh :
-`mvn swagger2markup:convertSwagger2markup asciidoctor:process-asciidoc`
-
-## Tips
-
-* Do not forget to set up the CLIENT_SECRET environment variable when deploying.
-
 ## License
 
 Copyright © 2016 LREN CHUV
diff --git a/circle.yml b/circle.yml
index ac3cf37b3..67aad75d3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ machine:
     - docker
 dependencies:
   pre:
-    - curl -sL https://github.com/harbur/captain/releases/download/v0.0.1/captain > ~/bin/captain
+    - curl -sL https://github.com/harbur/captain/releases/download/v1.0.0/captain > ~/bin/captain
     - chmod u+x ~/bin/captain
 test:
   override:
-- 
GitLab