Skip to content
This repository has been archived by the owner on Feb 20, 2024. It is now read-only.

Commit

Permalink
Documentation update (#168)
Browse files Browse the repository at this point in the history
* fix: docs update

* fix: jackson databind bump

* fix: version bump
  • Loading branch information
RadovanTomik authored Dec 23, 2022
1 parent c3d3aec commit 24aba54
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 24 deletions.
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
![build](https://github.com/BBMRI-ERIC/negotiator-v2/actions/workflows/build.yml/badge.svg?)
[![codecov](https://codecov.io/github/BBMRI-ERIC/negotiator-v2/branch/feature/github_actions/graph/badge.svg?token=8W0I985ZXI)](https://codecov.io/github/BBMRI-ERIC/negotiator-v2)
![Latest Release](https://img.shields.io/github/v/release/bbmri-eric/negotiator-v2)

## Getting Started
![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/bbmrieric/negotiator)


This application uses a database with the name of 'negotiator'. Feel free to change the name but remember to update it in pom.xml
Following are the settings in the pom file that need to be updated according to your requirements
## Getting Started
The simplest way to spin up a negotiator instance is using docker. The commands bellow will start an instance with test
data and the authentication disabled:

<database.server>server.name</database.server>
<database.port>port.number</database.port>
<database.name>negotiator</database.name>
<database.username>database.user.name</database.username>
<database.password>database.password</database.password>
`docker network create negotiator`

Before starting the application, it is necessary to create a database.
`docker run --name negotiator-db --network negotiator -p 5432:5432 -e POSTGRES_PASSWORD=negotiator -e POSTGRES_USER=negotiator -e POSTGRES_DB=negotiator -d postgres:14`

`docker run -d --name negotiator --network negotiator -p 8080:8080 -e POSTGRES_HOST="negotiator-db" -e AUTH="true" bbmrieric/negotiator`
## Development mode

By settings the runtime property `de.samply.development.authenticationDisabled` to `true` in the bbmri.negotiator.xml,
Expand Down
16 changes: 2 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>bbmri-negotiator</artifactId>
<version>2.7.1</version>
<version>2.7.2</version>



Expand All @@ -27,25 +27,12 @@
<version.samply.share.dto>4.0.0</version.samply.share.dto>
<version.swagger.core>2.1.4</version.swagger.core>

<!--<database.server>negotiator-db</database.server>
<database.port>5432</database.port>
<database.name>negotiator</database.name>
<database.username>saher</database.username>
<database.password>saher</database.password>-->

<!--<database.server>localhost</database.server>
<database.port>5434</database.port>
<database.name>negotiator</database.name>
<database.username>negotiator</database.username>
<database.password>negotiator</database.password>-->

<database.server>localhost</database.server>
<database.port>5432</database.port>
<database.name>negotiator</database.name>
<database.username>negotiator</database.username>
<database.password>negotiator</database.password>
<!--<database.name>neg-20190910</database.name>-->
<!--<database.password>0bpCP58yTJnNQmKqO9mX</database.password>-->

<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
Expand Down Expand Up @@ -384,6 +371,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.14.0</version>
</dependency>

<!-- Webjars -->
Expand Down

0 comments on commit 24aba54

Please sign in to comment.