From 24f650fdc19febf60c3002c125da897199f4e8a4 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 17 May 2021 23:30:49 +1000 Subject: refactor pipeline stages --- docker/build-osm.Dockerfile | 10 ++++++++++ docker/build-vicmap.Dockerfile | 7 +++++++ docker/build.Dockerfile | 7 ------- docker/conflate.Dockerfile | 9 +++------ 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 docker/build-osm.Dockerfile create mode 100644 docker/build-vicmap.Dockerfile delete mode 100644 docker/build.Dockerfile (limited to 'docker') 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-vicmap.Dockerfile b/docker/build-vicmap.Dockerfile new file mode 100644 index 0000000..95b28f1 --- /dev/null +++ b/docker/build-vicmap.Dockerfile @@ -0,0 +1,7 @@ +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 + diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile deleted file mode 100644 index 95b28f1..0000000 --- a/docker/build.Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -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 - 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 + -- cgit v1.2.3