Skip to content

Commit

Permalink
Docker: update base image to ubuntu:20.04 [ci skip] (OSGeo#3043)
Browse files Browse the repository at this point in the history
  • Loading branch information
mwtoews authored Feb 9, 2022
1 parent 021d6bb commit 46da96b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
##
# OSGeo/PROJ

FROM ubuntu:18.04 as builder
FROM ubuntu:20.04 as builder

MAINTAINER Howard Butler <[email protected]>

ARG DESTDIR="/build"

# Setup build env
RUN apt-get update -y \
&& apt-get install -y --fix-missing --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
software-properties-common build-essential ca-certificates \
make cmake wget unzip libtool automake \
zlib1g-dev libsqlite3-dev pkg-config sqlite3 libcurl4-gnutls-dev \
cmake wget unzip \
zlib1g-dev libsqlite3-dev sqlite3 libcurl4-gnutls-dev \
libtiff5-dev

COPY . /PROJ
Expand All @@ -27,7 +27,7 @@ RUN cd /PROJ \



FROM ubuntu:18.04 as runner
FROM ubuntu:20.04 as runner

RUN date

Expand Down
2 changes: 1 addition & 1 deletion docs/docbuild/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
python3-dev python3-pip g++ doxygen dvipng latexmk \
Expand Down

0 comments on commit 46da96b

Please sign in to comment.