Tidy up Dockerfiles a bit

Author: rustprooflabs

build/docker/pgdd-ubuntu-bionic/Dockerfile

@@ -32,8 +32,4 @@ ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 RUN /bin/bash rustup.sh -y \
 	&& cargo install cargo-pgx
 
-RUN cargo pgx init \
-	--pg10=/usr/lib/postgresql/10/bin/pg_config \
-	--pg11=/usr/lib/postgresql/11/bin/pg_config \
-	--pg12=/usr/lib/postgresql/12/bin/pg_config \
-	--pg13=/usr/lib/postgresql/13/bin/pg_config 
+RUN cargo pgx init

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -15,13 +15,13 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/
 RUN apt-get update
 RUN apt-get install -y \
         clang-10 llvm-10 clang libz-dev strace pkg-config \
-        libxml2 libxml2-dev libreadline8 flex bison libbison-dev build-essential \
+        libxml2 libxml2-dev libreadline8 libreadline-gplv2-dev \
+        flex bison libbison-dev build-essential \
         zlib1g-dev libxslt-dev libssl-dev libxml2-utils xsltproc libgss-dev \
         libldap2-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
         libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
-        ruby ruby-dev rubygems
-
-RUN apt-get install -y postgresql-server-dev-10 \
+        ruby ruby-dev rubygems \
+        postgresql-server-dev-10 \
         postgresql-server-dev-11 \
         postgresql-server-dev-12 \
         postgresql-server-dev-13
@@ -39,8 +39,4 @@ ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 RUN /bin/bash rustup.sh -y \
     && cargo install cargo-pgx
 
-RUN cargo pgx init \
-    --pg10=/usr/lib/postgresql/10/bin/pg_config \
-    --pg11=/usr/lib/postgresql/11/bin/pg_config \
-    --pg12=/usr/lib/postgresql/12/bin/pg_config \
-    --pg13=/usr/lib/postgresql/13/bin/pg_config 
+RUN cargo pgx init

sql/load-order.txt

@@ -0,0 +1 @@
+lib.generated.sql