From 444032ff17c646c290765e85640e1b39445a40ab Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Sun, 16 May 2021 17:42:35 +1000 Subject: fix docker --- docker/build.Dockerfile | 4 ++-- docker/conflate.Dockerfile | 4 ++-- docker/prepare.Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index 9893c24..95b28f1 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim RUN apt-get -y update && apt-get -y install curl gnupg make -RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - -RUN curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +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 858ab3e..6043176 100644 --- a/docker/conflate.Dockerfile +++ b/docker/conflate.Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin osmium-tool software-properties-common -RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - -RUN curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +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 diff --git a/docker/prepare.Dockerfile b/docker/prepare.Dockerfile index 662df44..3d97ff4 100644 --- a/docker/prepare.Dockerfile +++ b/docker/prepare.Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin -RUN -fsSL https://deb.nodesource.com/setup_12.x | bash - -RUN curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - +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 -- cgit v1.2.3