Skip to content

Commit

Permalink
Set version via global arg
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-evans committed May 5, 2020
1 parent 607fe61 commit dba12ab
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ jobs:
name: Load cached Docker image
command: |
docker load -i /tmp/workspace/latest.tar
- run:
name: Inspect Docker image
command: |
docker inspect $IMAGE_NAME:latest
- run:
name: Test Docker image
command: |
Expand Down
16 changes: 10 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ARG nominatim_version=3.4.2

FROM peterevans/xenial-gcloud:1.2.23 as builder

ENV NOMINATIM_VERSION 3.4.2
ARG nominatim_version

# Let the container know that there is no TTY
ARG DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -28,10 +30,10 @@ RUN apt-get -y update \

# Build Nominatim
RUN cd /srv \
&& curl --silent -L http://www.nominatim.org/release/Nominatim-$NOMINATIM_VERSION.tar.bz2 -o v$NOMINATIM_VERSION.tar.bz2 \
&& tar xf v$NOMINATIM_VERSION.tar.bz2 \
&& rm v$NOMINATIM_VERSION.tar.bz2 \
&& mv Nominatim-$NOMINATIM_VERSION nominatim \
&& curl --silent -L http://www.nominatim.org/release/Nominatim-${nominatim_version}.tar.bz2 -o v${nominatim_version}.tar.bz2 \
&& tar xf v${nominatim_version}.tar.bz2 \
&& rm v${nominatim_version}.tar.bz2 \
&& mv Nominatim-${nominatim_version} nominatim \
&& cd nominatim \
&& mkdir build \
&& cd build \
Expand All @@ -41,6 +43,8 @@ RUN cd /srv \

FROM peterevans/xenial-gcloud:1.2.23

ARG nominatim_version

LABEL \
maintainer="Peter Evans <[email protected]>" \
org.opencontainers.image.title="nominatim-k8s" \
Expand All @@ -49,7 +53,7 @@ LABEL \
org.opencontainers.image.url="https://github.com/peter-evans/nominatim-k8s" \
org.opencontainers.image.vendor="https://peterevans.dev" \
org.opencontainers.image.licenses="MIT" \
app.tag="nominatim$NOMINATIM_VERSION"
app.tag="nominatim${nominatim_version}"

# Let the container know that there is no TTY
ARG DEBIAN_FRONTEND=noninteractive
Expand Down

0 comments on commit dba12ab

Please sign in to comment.