From 23ebc0e47e97256f99ef4504623d9ee2a948a29f Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Tue, 15 Mar 2022 18:35:42 +0100
Subject: [PATCH] Ubuntu 22.04 has postgresql-client 14

---
 dockerfiles/Dockerfile | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
index 9e1eecb43ea..dcd8a3493d9 100644
--- a/dockerfiles/Dockerfile
+++ b/dockerfiles/Dockerfile
@@ -23,21 +23,12 @@ RUN apt-get -y install \
         libmysqlclient-dev \
         libfreetype6 \
         libjpeg-dev \
+        postgresql-client \
         sqlite \
         netcat \
         telnet \
         lsb-release
 
-# https://www.postgresql.org/download/linux/ubuntu/
-# Use PostgreSQL client 12 from official PostgreSQL Ubuntu's repository to avoid this WARNING
-# WARNING: psql major version 10, server major version 12.
-# Some psql features might not work.
-# TODO: remove this when upgrading to Ubuntu 20.04 LTS
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-RUN curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get -y update
-RUN apt-get -y install postgresql-client-12
-
 # Uncomment en_US.UTF-8 locale and generate it
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     locale-gen