diff options
| author | Andrew Harvey <andrew@alantgeo.com.au> | 2022-05-24 15:35:03 +1000 |
|---|---|---|
| committer | Andrew Harvey <andrew@alantgeo.com.au> | 2022-05-24 15:35:03 +1000 |
| commit | d5f31ce81fc881d0ba07d68c4393771fb0d6bb55 (patch) | |
| tree | 992e0efcb18c2918708af625efcc0b055224752d | |
| parent | 0b5e9f5dda7041e1ca6d2ff513e4cbd25bee2ce5 (diff) | |
update docker images
| -rw-r--r-- | docker/build-osm.Dockerfile | 4 | ||||
| -rw-r--r-- | docker/build-vicmap.Dockerfile | 2 | ||||
| -rw-r--r-- | docker/candidate.Dockerfile | 2 | ||||
| -rw-r--r-- | docker/conflate.Dockerfile | 2 | ||||
| -rw-r--r-- | docker/prepare.Dockerfile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docker/build-osm.Dockerfile b/docker/build-osm.Dockerfile index cbcf972..26218f7 100644 --- a/docker/build-osm.Dockerfile +++ b/docker/build-osm.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:unstable-slim +FROM debian:bullseye-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_16.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - @@ -6,6 +6,6 @@ RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources RUN apt-get -y update && apt-get -y install nodejs yarn RUN wget -qO - https://qgis.org/downloads/qgis-2021.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-nightly-release unstable main" +RUN add-apt-repository "deb https://qgis.org/debian bullseye main" RUN apt-get -y update && apt-get -y install qgis RUN wget -qO /usr/bin/b2 'https://github.com/Backblaze/B2_Command_Line_Tool/releases/latest/download/b2-linux' && chmod +x /usr/bin/b2 diff --git a/docker/build-vicmap.Dockerfile b/docker/build-vicmap.Dockerfile index f6d1505..fd6fb49 100644 --- a/docker/build-vicmap.Dockerfile +++ b/docker/build-vicmap.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim RUN apt-get -y update && apt-get -y install curl wget gnupg make gdal-bin RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - diff --git a/docker/candidate.Dockerfile b/docker/candidate.Dockerfile index e384fce..55cb862 100644 --- a/docker/candidate.Dockerfile +++ b/docker/candidate.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim RUN apt-get -y update && apt-get -y install curl wget gnupg make git RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - diff --git a/docker/conflate.Dockerfile b/docker/conflate.Dockerfile index 40468f2..693c4ee 100644 --- a/docker/conflate.Dockerfile +++ b/docker/conflate.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim RUN apt-get -y update && apt-get -y install curl wget gnupg make RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - diff --git a/docker/prepare.Dockerfile b/docker/prepare.Dockerfile index dc28b7a..a69b3d1 100644 --- a/docker/prepare.Dockerfile +++ b/docker/prepare.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim RUN apt-get -y update && apt-get -y install curl gnupg make wget unzip gdal-bin RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - |