diff options
| author | Andrew Harvey <andrew@alantgeo.com.au> | 2021-05-17 23:30:49 +1000 |
|---|---|---|
| committer | Andrew Harvey <andrew@alantgeo.com.au> | 2021-05-17 23:30:49 +1000 |
| commit | 24f650fdc19febf60c3002c125da897199f4e8a4 (patch) | |
| tree | e9bbf4959ed019f09fb38ba76440cd0153c61a59 /docker | |
| parent | d6520f47b72b9a4dcc18a100bac055e9370da78f (diff) | |
refactor pipeline stages
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/build-osm.Dockerfile | 10 | ||||
| -rw-r--r-- | docker/build-vicmap.Dockerfile (renamed from docker/build.Dockerfile) | 0 | ||||
| -rw-r--r-- | docker/conflate.Dockerfile | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/docker/build-osm.Dockerfile b/docker/build-osm.Dockerfile new file mode 100644 index 0000000..c557fe3 --- /dev/null +++ b/docker/build-osm.Dockerfile @@ -0,0 +1,10 @@ +FROM debian:unstable-slim +RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin osmium-tool software-properties-common +RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list +RUN apt-get -y update && apt-get -y install nodejs yarn +RUN wget -qO - https://qgis.org/downloads/qgis-2020.gpg.key | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import +RUN chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg +RUN add-apt-repository "deb https://qgis.org/debian unstable main" +RUN apt-get -y update && apt-get -y install qgis diff --git a/docker/build.Dockerfile b/docker/build-vicmap.Dockerfile index 95b28f1..95b28f1 100644 --- a/docker/build.Dockerfile +++ b/docker/build-vicmap.Dockerfile diff --git a/docker/conflate.Dockerfile b/docker/conflate.Dockerfile index c557fe3..95b28f1 100644 --- a/docker/conflate.Dockerfile +++ b/docker/conflate.Dockerfile @@ -1,10 +1,7 @@ -FROM debian:unstable-slim -RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin osmium-tool software-properties-common +FROM debian:buster-slim +RUN apt-get -y update && apt-get -y install curl gnupg make RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list RUN apt-get -y update && apt-get -y install nodejs yarn -RUN wget -qO - https://qgis.org/downloads/qgis-2020.gpg.key | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import -RUN chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg -RUN add-apt-repository "deb https://qgis.org/debian unstable main" -RUN apt-get -y update && apt-get -y install qgis + |