From c9347144aff2f5d406bbedb5dcc0c5971f1b87c7 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 1 Apr 2019 07:41:00 -0700 Subject: [PATCH 1/9] osrm-routed docker based on centos7-osrm-soe --- .../osrm-routed-docker/Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docker-orchestration/osrm-routed-docker/Dockerfile diff --git a/docker-orchestration/osrm-routed-docker/Dockerfile b/docker-orchestration/osrm-routed-docker/Dockerfile new file mode 100644 index 000000000..44a07018f --- /dev/null +++ b/docker-orchestration/osrm-routed-docker/Dockerfile @@ -0,0 +1,17 @@ + +# osrm runtime base image +ARG DOCKER_REGISTRY_PREEFIX=ec2d-dockerregistry-01.mypna.com:8083/ +FROM ${DOCKER_REGISTRY_PREEFIX}centos7-osrm-soe + +# built osrm binaries package, e.g. "http://{file_server}/osrm-artifacts.tar.gz" +ARG ARTIFACTS_PACKAGE + +WORKDIR /osrm-bin +RUN cd /osrm-bin && \ + wget --progress=dot:mega ${ARTIFACTS_PACKAGE} -O osrm-artifacts.tar.gz --no-check-certificate && \ + tar -zxf osrm-artifacts.tar.gz + +EXPOSE 5000 + +ENTRYPOINT ["osrm-routed"] + From 5b2b97bb059d6be6c2888661680f21a832049dfe Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 2 Apr 2019 03:47:06 -0700 Subject: [PATCH 2/9] osrm-data-docker Dockerfile --- docker-orchestration/osrm-data-docker/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 docker-orchestration/osrm-data-docker/Dockerfile diff --git a/docker-orchestration/osrm-data-docker/Dockerfile b/docker-orchestration/osrm-data-docker/Dockerfile new file mode 100644 index 000000000..79d9fed3a --- /dev/null +++ b/docker-orchestration/osrm-data-docker/Dockerfile @@ -0,0 +1,13 @@ + +# osrm runtime base image +ARG DOCKER_REGISTRY_PREEFIX=ec2d-dockerregistry-01.mypna.com:8083/ +FROM ${DOCKER_REGISTRY_PREEFIX}centos7-osrm-soe + +# built osrm mapdata files +ARG MAPDATA_PATH +ENV MAPDATA_PATH ${MAPDATA_PATH} + +WORKDIR /mapdata +ADD ${MAPDATA_PATH}/* /mapdata/ + + From 6f17286a9ac8aa75c0d14f3310aaf4206f383c8d Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 2 Apr 2019 19:04:37 -0700 Subject: [PATCH 3/9] fix osrm-route not in path issue --- docker-orchestration/osrm-routed-docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-orchestration/osrm-routed-docker/Dockerfile b/docker-orchestration/osrm-routed-docker/Dockerfile index 44a07018f..5b2ef92d6 100644 --- a/docker-orchestration/osrm-routed-docker/Dockerfile +++ b/docker-orchestration/osrm-routed-docker/Dockerfile @@ -13,5 +13,5 @@ RUN cd /osrm-bin && \ EXPOSE 5000 -ENTRYPOINT ["osrm-routed"] +ENTRYPOINT ["/osrm-bin/osrm-routed"] From 87ccf7a6e8b4adf9059093100d5552204d6dcdcd Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Thu, 4 Apr 2019 01:18:06 -0700 Subject: [PATCH 4/9] make mapdata mountable --- docker-orchestration/osrm-data-docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-orchestration/osrm-data-docker/Dockerfile b/docker-orchestration/osrm-data-docker/Dockerfile index 79d9fed3a..1de0db64e 100644 --- a/docker-orchestration/osrm-data-docker/Dockerfile +++ b/docker-orchestration/osrm-data-docker/Dockerfile @@ -10,4 +10,6 @@ ENV MAPDATA_PATH ${MAPDATA_PATH} WORKDIR /mapdata ADD ${MAPDATA_PATH}/* /mapdata/ +# make the folder mountable +VOLUME /mapdata From f1a9221b64f9b1559d7eeb4b37e6d6c42665ffd4 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Sun, 7 Apr 2019 20:13:02 -0700 Subject: [PATCH 5/9] fix copy contents issue --- docker-orchestration/osrm-data-docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-orchestration/osrm-data-docker/Dockerfile b/docker-orchestration/osrm-data-docker/Dockerfile index 1de0db64e..dde3568ea 100644 --- a/docker-orchestration/osrm-data-docker/Dockerfile +++ b/docker-orchestration/osrm-data-docker/Dockerfile @@ -8,7 +8,7 @@ ARG MAPDATA_PATH ENV MAPDATA_PATH ${MAPDATA_PATH} WORKDIR /mapdata -ADD ${MAPDATA_PATH}/* /mapdata/ +ADD ${MAPDATA_PATH} /mapdata/ # make the folder mountable VOLUME /mapdata From f8ccd98747567cfd85427f920037672607c0d273 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 11 Jun 2019 06:07:41 -0700 Subject: [PATCH 6/9] dev docker for osrm-backend --- .../osrm-backend-dev/Dockerfile | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 docker-orchestration/osrm-backend-dev/Dockerfile diff --git a/docker-orchestration/osrm-backend-dev/Dockerfile b/docker-orchestration/osrm-backend-dev/Dockerfile new file mode 100644 index 000000000..fd1a6fa02 --- /dev/null +++ b/docker-orchestration/osrm-backend-dev/Dockerfile @@ -0,0 +1,44 @@ + +FROM debian:stretch-slim + +# Install necessary packages for proper system state +RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + build-essential \ + cmake \ + curl \ + wget \ + tmux \ + vim \ + git \ + libboost-all-dev \ + libbz2-dev \ + libtbb-dev \ + libxml2-dev \ + libzip-dev \ + lua5.2 \ + liblua5.2-dev \ + libluabind-dev \ + pkg-config + +# install go +RUN wget --progress=dot:mega https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz && \ + tar -zxf go1.12.5.linux-amd64.tar.gz && \ + mv go /usr/local/ && \ + rm -f go1.12.5.linux-amd64.tar.gz && \ + mkdir -p /workspace/go/bin /workspace/go/src /workspace/go/pkg + +# set env +ENV GO_HOME=/usr/local/go +ENV PATH=${GO_HOME}/bin/:$PATH +ENV GOPATH=/workspace/go + +# install thrift 0.12.0 go pkg +RUN cd /workspace/go && \ + mkdir -p src/github.com/apache && \ + cd src/github.com/apache && \ + git clone -b 0.12.0 https://github.com/apache/thrift.git && \ + cd thrift && \ + git branch && \ + cd /workspace/go && \ + go install github.com/apache/thrift/lib/go/thrift + From f39d662d9ebe5ab8fbdb9c55318b401e2baface2 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 11 Jun 2019 08:13:25 -0700 Subject: [PATCH 7/9] dockerfile for telenav osrm-backend --- docker-orchestration/osrm-backend/Dockerfile | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 docker-orchestration/osrm-backend/Dockerfile diff --git a/docker-orchestration/osrm-backend/Dockerfile b/docker-orchestration/osrm-backend/Dockerfile new file mode 100644 index 000000000..58645fb0b --- /dev/null +++ b/docker-orchestration/osrm-backend/Dockerfile @@ -0,0 +1,46 @@ + + +FROM wangyoucao577/osrm-backend-dev as builder +ARG BRANCH_NAME=master-telenav + +RUN echo "Building branch ${BRANCH_NAME}" && \ + git clone -b ${BRANCH_NAME} https://github.com/Telenav/osrm-backend.git && \ + mkdir -p osrm-backend/build && \ + cd osrm-backend/build && \ + cmake .. -DENABLE_LTO=On && \ + cmake --build . -- -j && \ + mkdir /osrm-build && \ + cp /osrm-backend/build/osrm* /osrm-build/ && \ + cp -r /osrm-backend/profiles /osrm-build/ + + +FROM wangyoucao577/osrm-backend-dev as gobuilder +ARG BRANCH_NAME=master-telenav + +WORKDIR /workspace/go +RUN echo "Building branch ${BRANCH_NAME}" && \ + mkdir -p src/github.com/Telenav && \ + cd src/github.com/Telenav && \ + git clone -b ${BRANCH_NAME} https://github.com/Telenav/osrm-backend.git && \ + cd ../../../ && \ + if [ -d "src/github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater" ]; then \ + go install github.com/Telenav/osrm-backend/traffic_updater/go/gen-go/proxy && \ + go install github.com/Telenav/osrm-backend/traffic_updater/go/osrm_traffic_updater && \ + ls -lh bin/ \ + ;fi + + +FROM debian:stretch-slim as runstage + +RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libboost-program-options1.62.0 libboost-regex1.62.0 \ + libboost-date-time1.62.0 libboost-chrono1.62.0 libboost-filesystem1.62.0 \ + libboost-iostreams1.62.0 libboost-thread1.62.0 expat liblua5.2-0 libtbb2 && \ + rm -rf /var/lib/apt/lists/* + +RUN mkdir /osrm-build + +COPY --from=builder /osrm-build /osrm-build/ +COPY --from=gobuilder /workspace/go/bin /osrm-build/ + + From 787addf1c1cc76c8aed11219d1e6c72e93ba9f95 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 11 Jun 2019 23:27:49 +0800 Subject: [PATCH 8/9] readme --- docker-orchestration/README.md | 10 ++++++++++ docker-orchestration/osrm-backend-dev/README.md | 9 +++++++++ docker-orchestration/osrm-backend/README.md | 14 ++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 docker-orchestration/README.md create mode 100644 docker-orchestration/osrm-backend-dev/README.md create mode 100644 docker-orchestration/osrm-backend/README.md diff --git a/docker-orchestration/README.md b/docker-orchestration/README.md new file mode 100644 index 000000000..a99b79fba --- /dev/null +++ b/docker-orchestration/README.md @@ -0,0 +1,10 @@ +# Docker Orchestration + +## Docker Images +### osrm-backend-dev +Base image for telenav osrm-backend development, include all building and running dependencies. +See details in [osrm-backend-dev docker](./osrm-backend-dev/). + +### osrm-backend +Image within built osrm binaries(`osrm-extract/osrm-partition/osrm-customize/...`) and running dependencies. +See details in [osrm-backend docker](./osrm-backend/) \ No newline at end of file diff --git a/docker-orchestration/osrm-backend-dev/README.md b/docker-orchestration/osrm-backend-dev/README.md new file mode 100644 index 000000000..c259922be --- /dev/null +++ b/docker-orchestration/osrm-backend-dev/README.md @@ -0,0 +1,9 @@ +# osrm-backend-dev docker + +## Build Image + +```bash +$ cd docker-orchestration/osrm-backend-dev +$ DOCKER_BUILDKIT=1 docker build -t telenav/osrm-backend-dev . + +``` \ No newline at end of file diff --git a/docker-orchestration/osrm-backend/README.md b/docker-orchestration/osrm-backend/README.md new file mode 100644 index 000000000..ab7aa6273 --- /dev/null +++ b/docker-orchestration/osrm-backend/README.md @@ -0,0 +1,14 @@ +# telenav osrm-backend docker + +## Build Image + +```bash +$ cd docker-orchestration/osrm-backend + +# build source from default branch master-telenav +$ DOCKER_BUILDKIT=1 docker build -t telenav/osrm-backend . + +# build source from specified branch, e.g. feature/telenav-import-internal-pbf +$ DOCKER_BUILDKIT=1 docker build -t telenav/osrm-backend:telenav-import-internal-pbf --build-arg BRANCH_NAME=feature/telenav-import-internal-pbf . + +``` From 447b9b1a9024dd8234078aff9b4d17bb7c57f47b Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Fri, 14 Jun 2019 17:46:20 +0800 Subject: [PATCH 9/9] delete unnecessary Dockerfile --- .../osrm-data-docker/Dockerfile | 15 --------------- .../osrm-routed-docker/Dockerfile | 17 ----------------- 2 files changed, 32 deletions(-) delete mode 100644 docker-orchestration/osrm-data-docker/Dockerfile delete mode 100644 docker-orchestration/osrm-routed-docker/Dockerfile diff --git a/docker-orchestration/osrm-data-docker/Dockerfile b/docker-orchestration/osrm-data-docker/Dockerfile deleted file mode 100644 index dde3568ea..000000000 --- a/docker-orchestration/osrm-data-docker/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ - -# osrm runtime base image -ARG DOCKER_REGISTRY_PREEFIX=ec2d-dockerregistry-01.mypna.com:8083/ -FROM ${DOCKER_REGISTRY_PREEFIX}centos7-osrm-soe - -# built osrm mapdata files -ARG MAPDATA_PATH -ENV MAPDATA_PATH ${MAPDATA_PATH} - -WORKDIR /mapdata -ADD ${MAPDATA_PATH} /mapdata/ - -# make the folder mountable -VOLUME /mapdata - diff --git a/docker-orchestration/osrm-routed-docker/Dockerfile b/docker-orchestration/osrm-routed-docker/Dockerfile deleted file mode 100644 index 5b2ef92d6..000000000 --- a/docker-orchestration/osrm-routed-docker/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ - -# osrm runtime base image -ARG DOCKER_REGISTRY_PREEFIX=ec2d-dockerregistry-01.mypna.com:8083/ -FROM ${DOCKER_REGISTRY_PREEFIX}centos7-osrm-soe - -# built osrm binaries package, e.g. "http://{file_server}/osrm-artifacts.tar.gz" -ARG ARTIFACTS_PACKAGE - -WORKDIR /osrm-bin -RUN cd /osrm-bin && \ - wget --progress=dot:mega ${ARTIFACTS_PACKAGE} -O osrm-artifacts.tar.gz --no-check-certificate && \ - tar -zxf osrm-artifacts.tar.gz - -EXPOSE 5000 - -ENTRYPOINT ["/osrm-bin/osrm-routed"] -