Skip to content

Commit

Permalink
Merge branch 'master' into fix#832-runfile
Browse files Browse the repository at this point in the history
  • Loading branch information
takb authored Jan 25, 2021
2 parents 41566ed + 3e21c79 commit 77a576c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ RELEASING:
## [Unreleased]
### Added
- output run file to signal completion of graph building/loading at init time
### Fixed
- Define behavior for first container start with existing app.config

## [6.3.4] - 2021-01-19
### Changed
Expand All @@ -59,7 +61,7 @@ RELEASING:
### Fixed
- Updated documentation for running in Docker ([#798](https://github.com/GIScience/openrouteservice/issues/798))
- Handle invalid combination of HillIndexStorage without elevation ([#683](https://github.com/GIScience/openrouteservice/issues/683))
- Enabled turning off elevation data handling for profiles
- Enabled turning off elevation data handling for profiles
- Fixed a bug in fast isochrones preprocessing

## [6.3.0] - 2020-09-14
Expand Down
2 changes: 2 additions & 0 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ if [ -d "/usr/local/tomcat/webapps/ors" ]; then
else
if [ ! -f /ors-conf/app.config ]; then
cp -f $source_appconfig /ors-conf/app.config
else
cp -f /ors-conf/app.config $source_appconfig
fi
echo "### Package openrouteservice and deploy to Tomcat ###"
mvn -q -f /ors-core/openrouteservice/pom.xml package -DskipTests && \
Expand Down

0 comments on commit 77a576c

Please sign in to comment.