From 8eae33b7573765e441b5fd541381f498d04adb3c Mon Sep 17 00:00:00 2001
From: zstadler <zeev.stadler@gmail.com>
Date: Wed, 16 Nov 2022 09:04:22 +0200
Subject: [PATCH 1/3] Allow local image build

- Remove dependency on github download
- Add `github/build.sh` for local builds
- Simplify gtaphhopper build
- Simplify handling of `graphhopper.sh` and `config-example.yml`
---
 .github/build-and-upload.sh | 15 ++-------------
 .github/build.sh            |  6 ++++++
 Dockerfile                  |  8 +++-----
 README.md                   |  2 ++
 4 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 .github/build.sh

diff --git a/.github/build-and-upload.sh b/.github/build-and-upload.sh
index 0084c91..217bb7d 100644
--- a/.github/build-and-upload.sh
+++ b/.github/build-and-upload.sh
@@ -2,30 +2,19 @@
 
 echo "Cloning graphhopper"
 git clone https://github.com/graphhopper/graphhopper.git
-cd graphhopper
-echo "Downloading Dockerfile and graphhopper.sh"
-curl -L https://raw.githubusercontent.com/IsraelHikingMap/graphhopper-docker-image-push/main/Dockerfile > Dockerfile
-curl -L https://raw.githubusercontent.com/IsraelHikingMap/graphhopper-docker-image-push/main/graphhopper.sh > graphhopper.sh
-chmod +x ./graphhopper.sh
 echo "Building docker image"
 docker build . -t israelhikingmap/graphhopper:latest
 docker login --username $DOCKERHUB_USER --password $DOCKERHUB_TOKEN
 echo "Publishing docker image"
 docker push israelhikingmap/graphhopper:latest
 
-TAG=`git for-each-ref --sort=committerdate refs/tags | tail -n 1 | cut -d "/" -f3`
+TAG=`cd graphhopper; git for-each-ref --sort=committerdate refs/tags | tail -n 1 | cut -d "/" -f3`
 if docker manifest inspect israelhikingmap/graphhopper:$TAG >/dev/null; then 
     echo "No need to publish existing version: $TAG";
 else
-    mv Dockerfile ../Dockerfile
-    mv graphhopper.sh ../graphhopper.sh
-    git checkout tags/$TAG
-    mv ../Dockerfile Dockerfile
-    mv ../graphhopper.sh graphhopper.sh
+    (cd graphhopper ; git checkout tags/$TAG)
     echo "Building docker image for tag: $TAG"
     docker build . -t israelhikingmap/graphhopper:$TAG
     echo "Publishing docker image for tag: $TAG"
     docker push israelhikingmap/graphhopper:$TAG
 fi
-
-
diff --git a/.github/build.sh b/.github/build.sh
new file mode 100644
index 0000000..d6a1af5
--- /dev/null
+++ b/.github/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "Cloning graphhopper"
+git clone https://github.com/graphhopper/graphhopper.git
+echo "Building docker image"
+docker build . -t israelhikingmap/graphhopper:latest
diff --git a/Dockerfile b/Dockerfile
index 0bee0b3..14449cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,8 @@
 FROM maven:3.6.3-jdk-8 as build
 
-RUN apt-get install -y wget
-
 WORKDIR /graphhopper
 
-COPY . .
+COPY graphhopper .
 
 RUN mvn clean install
 
@@ -16,9 +14,9 @@ RUN mkdir -p /data
 
 WORKDIR /graphhopper
 
-COPY --from=build /graphhopper/web/target/graphhopper*.jar ./
+COPY --from=build /graphhopper/web/target/graphhopper*.jar .
 
-COPY ./config-example.yml ./
+COPY graphhopper.sh graphhopper/config-example.yml .
 
 COPY ./graphhopper.sh ./
 
diff --git a/README.md b/README.md
index 6ee99e3..b767e2e 100644
--- a/README.md
+++ b/README.md
@@ -32,3 +32,5 @@ docker run --entrypoint /bin/bash israelhikingmap/graphhopper -c "wget https://d
 ```
 
 Checkout `graphhopper.sh` for more usage options such as import.
+
+In order to build the docker image locally, please run [`.github/build.sh`](.github/build.sh).

From 93be94429cfa4c1578ad7a6e6e663514281b4adf Mon Sep 17 00:00:00 2001
From: zstadler <zeev.stadler@gmail.com>
Date: Wed, 16 Nov 2022 14:09:57 +0200
Subject: [PATCH 2/3] Remove duplicate copy

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 14449cd..2ae189b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,6 @@ COPY --from=build /graphhopper/web/target/graphhopper*.jar .
 
 COPY graphhopper.sh graphhopper/config-example.yml .
 
-COPY ./graphhopper.sh ./
-
 VOLUME [ "/data" ]
 
 EXPOSE 8989

From 523f949108fad3aa2ebd150bc6ce8ac7cdeaaeb1 Mon Sep 17 00:00:00 2001
From: zstadler <zeev.stadler@gmail.com>
Date: Wed, 16 Nov 2022 17:14:23 +0200
Subject: [PATCH 3/3] move build script to top direcctory

---
 .github/build.sh => build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/build.sh => build.sh (100%)

diff --git a/.github/build.sh b/build.sh
similarity index 100%
rename from .github/build.sh
rename to build.sh