Merge pull request #280 from nrenner/update-deps

Update leaflet-triangle-marker dependency to fix leaflet incompatibility
This commit is contained in:
Norbert Renner 2020-03-18 12:44:04 +01:00 committed by GitHub
commit 46ed85be2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 13 deletions

View file

@ -66,14 +66,12 @@ separate Nginx based image. The application runs from a webserver only container
#### Prerequisites #### Prerequisites
- Docker installed - Docker installed
- working directory is this repository - working directory is this repository
- `config.template.js` copied to `config.js` and modified with a Brouter server, see `BR.conf.host` - `config.template.js` copied to `config.js` and modified with a Brouter server, see `BR.conf.host`
- `keys.template.js` to `keys.js` and add your API keys - `keys.template.js` to `keys.js` and add your API keys
- Optionally create `profiles` directory with `brf` profile files and add path to `config.js`: - Optionally create `profiles` directory with `brf` profile files and add path to `config.js`:
BR.conf.profilesUrl = 'profiles/';
BR.conf.profilesUrl = 'profiles/';
#### Building Docker image #### Building Docker image
@ -96,10 +94,10 @@ To run the previously build Docker image run:
This command does the following: This command does the following:
1. Runs a container with the name `brouter-web` and removes it automatically after stopping 1. Runs a container with the name `brouter-web` and removes it automatically after stopping
1. Binds port 80 of the container to the host interface 127.0.0.1 on port 8080 1. Binds port 80 of the container to the host interface 127.0.0.1 on port 8080
1. Takes the absolute paths of `config.js`, `keys.js` and `profiles` and mounts them inside the container 1. Takes the absolute paths of `config.js`, `keys.js` and `profiles` and mounts them inside the container
1. Uses the image `brouter-web` to run as a container 1. Uses the image `brouter-web` to run as a container
brouter-web should be accessible at http://127.0.0.1:8080. brouter-web should be accessible at http://127.0.0.1:8080.

View file

@ -67,7 +67,7 @@
"leaflet-providers": "^1.5.0", "leaflet-providers": "^1.5.0",
"leaflet-routing": "nrenner/leaflet-routing#246ab4e", "leaflet-routing": "nrenner/leaflet-routing#246ab4e",
"leaflet-sidebar-v2": "nrenner/leaflet-sidebar-v2#dev", "leaflet-sidebar-v2": "nrenner/leaflet-sidebar-v2#dev",
"leaflet-triangle-marker": "^1.0.1", "leaflet-triangle-marker": "^1.0.2",
"leaflet.locatecontrol": "^0.60.0", "leaflet.locatecontrol": "^0.60.0",
"leaflet.snogylop": "^0.4.0", "leaflet.snogylop": "^0.4.0",
"leaflet.stravasegments": "2.3.2", "leaflet.stravasegments": "2.3.2",

View file

@ -4924,6 +4924,11 @@ leaflet-triangle-marker@^1.0.1:
resolved "https://registry.yarnpkg.com/leaflet-triangle-marker/-/leaflet-triangle-marker-1.0.1.tgz#0775ee4903c6c0b71b20023dfb295dfc026bc23d" resolved "https://registry.yarnpkg.com/leaflet-triangle-marker/-/leaflet-triangle-marker-1.0.1.tgz#0775ee4903c6c0b71b20023dfb295dfc026bc23d"
integrity sha512-nK2Wtp5tUPwg9STrE78oKLQJvcDZTMU5i+4la1zhHZKZcjoTl9oVVd0f6keMx+wN70IiHsoDkHCFzIiVcCs9eQ== integrity sha512-nK2Wtp5tUPwg9STrE78oKLQJvcDZTMU5i+4la1zhHZKZcjoTl9oVVd0f6keMx+wN70IiHsoDkHCFzIiVcCs9eQ==
leaflet-triangle-marker@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/leaflet-triangle-marker/-/leaflet-triangle-marker-1.0.2.tgz#e4c5f1d09d10ae078f8fba87aa32e5884017ad96"
integrity sha512-J2Xa5UgUV6rU04bcwAdQRptnLm7nSxDtxqfX0Nzb+tz6p3buyEEBkXdOvEgzD6ghuII6BVSXFb4QP8cyVKigXg==
leaflet.locatecontrol@^0.60.0: leaflet.locatecontrol@^0.60.0:
version "0.60.0" version "0.60.0"
resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.60.0.tgz#fc7be657ca9b7e8b8ba7263e52b0bb902b7cd965" resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.60.0.tgz#fc7be657ca9b7e8b8ba7263e52b0bb902b7cd965"