Revert "Upgrade to Ubuntu 22.04 (#383)"

This reverts commit 14d8539.
This reverts commit fd14ccf.

Upgrade may have broken some maps' bounding boxes (due to different
mapserver or GDAL versions?).

Dockerfile

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

Dockerfile_noproxy

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

Dockerfile_noproxy_private

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

Dockerfile_noproxy_tiles

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

Dockerfile_private

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

Dockerfile_tiles

@@ -1,19 +1,12 @@
-FROM ubuntu:22.04
+FROM ubuntu:18.04
 MAINTAINER [email protected]
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y \
-    apache2 \
-    cgi-mapserver \
-    curl \
-    gdal-bin \
-    gdal-data \
-    libmapcache1 \
-    libapache2-mod-mapcache \
-    mapserver-bin \
-    python3-pip \
-    wget
+RUN apt-get install -y build-essential curl gnupg python3-pip software-properties-common wget
+RUN add-apt-repository -y ppa:ubuntugis/ppa
 
+RUN apt-get install -y gdal-bin gdal-data libgdal20
+RUN apt-get install -y apache2 apache2-utils libmapcache1 libapache2-mod-mapcache cgi-mapserver mapserver-bin
 RUN python3 -m pip install mappyfile==0.9.7
 
 # Enable these Apache modules

tools/make_indexjson.py

@@ -1,6 +1,9 @@
 # Produces a JSON file containing an overview of available maps.
 # Usage:
 #   python3 tools/make_overview.py *.map
+#
+# This file needs to be compatible with Python 3.6 as long as our images
+# are based on Ubuntu 18.04.
 
 import json
 import logging