nit(docker): x86 image needs to be 18.04 (valhalla#2531)

* nit(docker): x86 image should also be ubuntu 20.04 * Back to latest * Push images * Revert "Push images" This reverts commit 6f4bd73. * update docs Co-authored-by: Kevin Kreiser <[email protected]>
zotttttttt · Aug 14, 2020 · 617e4c9 · 617e4c9
1 parent 8460b51
commit 617e4c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -135,6 +135,7 @@
    * ADDED: Check with address sanititizer in CI. Add support for undefined behavior sanitizer. [#2487](https://github.com/valhalla/valhalla/pull/2487)
    * ADDED: Ability to recost a path and increased cost/time details along the trippath and json output [#2425](https://github.com/valhalla/valhalla/pull/2425)
    * ADDED: Add the ability to do bikeshare based (ped/bike) multimodal routing [#2031](https://github.com/valhalla/valhalla/pull/2031)
+   * ADDED: Migrated to Ubuntu 20.04 base-image [#2508](https://github.com/valhalla/valhalla/pull/2508)
 
 ## Release Date: 2019-11-21 Valhalla 3.0.9
 * **Bug Fix**

diff --git a/docker/Dockerfile-build-x86 b/docker/Dockerfile-build-x86
@@ -1,4 +1,4 @@
-FROM i386/ubuntu:16.04
+FROM i386/ubuntu:18.04
 
 ADD install-shared-deps.sh .
 RUN bash ./install-shared-deps.sh

diff --git a/docker/README.md b/docker/README.md
@@ -12,5 +12,5 @@ Builds are automated: pushing a tag in the form of {major}.{minor}.{release} wil
 The routing engine will listen on and expose port 8002, and load any tile data found in `${VALHALLA_DOCKER_DATAPATH}`.
 
 ### To build/publish images manually
-* `docker build -f Dockerfile-[build|build-x86] --tag [version_tag] --no-cache --force-rm .`
-* `docker push valhalla/valhalla:{build|build-x86}-[version_tag]`
+* `docker build -f Dockerfile-[build|build-x86] --tag valhalla/valhalla:[build|build-x86]-[version_tag] --no-cache --force-rm .`
+* `docker push valhalla/valhalla:[build|build-x86]-[version_tag]`