Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade photon #2

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Upgrade photon #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8eb9635
upgrade to photon 0.3.0
jfelectron Sep 19, 2018
4a571e7
use pbzip
Mar 18, 2019
d081b01
Expose service on host network
jfelectron Jul 8, 2019
f2795bf
update image tag
jfelectron Jul 8, 2019
9e2398e
Revert "Expose service on host network"
Jul 8, 2019
321fb51
bump yaml vers, use host network in build
Jul 8, 2019
d75aee9
bump to photon 0.3.1
jfelectron Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /photon
ADD http://photon.komoot.de/data/photon-0.2.7.jar /photon/photon.jar
ADD https://github.com/komoot/photon/releases/download/0.3.1/photon-0.3.1.jar /photon/photon.jar
COPY entrypoint.sh ./entrypoint.sh

VOLUME /photon/photon_data
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: '2'
version: '3.4'
services:
photon:
build:
network: host
context: .
dockerfile: Dockerfile
image: thomasnordquist/photon-geocoder:latest
image: jfelectron/geocoder
volumes:
- data:/photon/photon_data
ports:
Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ ! -d "/photon/photon_data/elasticsearch" ]; then

# Let graphhopper know where the traffic is coming from
USER_AGENT="docker: thomasnordquist/photon-geocoder"
wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | bzip2 -cd | tar x
wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | pbzip2 -cd | tar x
fi

# Start photon if elastic index exists
Expand Down