Skip to content

Commit b940d6d

Browse files
authored
Merge pull request OSGeo#3859 from jjimenezshaw/docker-ubuntu-22.04
Docker: update base image to ubuntu:22.04
2 parents 994f5c7 + a0b49bc commit b940d6d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
# OSGeo/PROJ
33

4-
FROM ubuntu:20.04 as builder
4+
FROM ubuntu:22.04 as builder
55

66
MAINTAINER Howard Butler <[email protected]>
77

@@ -27,7 +27,7 @@ RUN cd /PROJ \
2727

2828

2929

30-
FROM ubuntu:20.04 as runner
30+
FROM ubuntu:22.04 as runner
3131

3232
RUN date
3333

docs/docbuild/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
44
python3-dev python3-pip g++ doxygen dvipng latexmk \
55
cmake libjpeg8-dev zlib1g-dev texlive-latex-base \
66
texlive-latex-extra git latex-cjk-all texlive-lang-all \
7-
graphviz python3-matplotlib wget unzip enchant locales
7+
graphviz python3-matplotlib wget unzip enchant-2 locales
88

9-
RUN python3 -m pip install Sphinx breathe \
9+
RUN python3 -m pip install "Sphinx<7" breathe \
1010
sphinx_bootstrap_theme awscli sphinxcontrib-bibtex \
1111
sphinx_rtd_theme recommonmark sphinx-markdown-tables \
1212
sphinxcontrib-spelling!=7.4.0

0 commit comments

Comments
 (0)