diff --git a/README.md b/README.md index 60095de01d70ff287d098aa6815b0491ffcadade..c71663ba6a11d168dc69cc2e97c0d49b75874870 100644 --- a/README.md +++ b/README.md @@ -2,34 +2,15 @@ [](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 ac3cf37b3bbd8478ca18518bfda343addae980a3..67aad75d35d47955267a5a7ad5750420520ee00b 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: