From e24f1dee6240c7ef888f02e4ede24ce3da3e8f00 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Thu, 9 Nov 2023 17:18:24 +0100 Subject: [PATCH 01/21] add missing packages we are installing during CI --- templates/Dockerfile-deb.tmpl | 1 + templates/Dockerfile-rpm.tmpl | 2 ++ 2 files changed, 3 insertions(+) diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index 663de0b5..15707881 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ %%release%%-pgdg main 16' postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index ed5a6179..7778935d 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -98,6 +98,8 @@ RUN ( yum install -y https://%%rpm_url%% \ tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ %%extra-packages%% \ && ( [[ %%release%% != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql%%pgshort%%-server postgresql%%pgshort%%-devel \ From 9f0d4d64c7f37f41ef4585e9412faa1709410bd9 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Thu, 9 Nov 2023 17:18:47 +0100 Subject: [PATCH 02/21] update docker files --- dockerfiles/almalinux-8-pg11/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg12/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg13/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg14/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg15/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg16/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg11/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg12/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg13/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg14/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg15/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg16/Dockerfile | 2 ++ dockerfiles/centos-7-pg11/Dockerfile | 2 ++ dockerfiles/centos-7-pg12/Dockerfile | 2 ++ dockerfiles/centos-7-pg13/Dockerfile | 2 ++ dockerfiles/centos-7-pg14/Dockerfile | 2 ++ dockerfiles/centos-7-pg15/Dockerfile | 2 ++ dockerfiles/centos-7-pg16/Dockerfile | 2 ++ dockerfiles/debian-bookworm-all/Dockerfile | 1 + dockerfiles/debian-bullseye-all/Dockerfile | 1 + dockerfiles/debian-buster-all/Dockerfile | 1 + dockerfiles/oraclelinux-6-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg16/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg13/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg16/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg13/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg16/Dockerfile | 2 ++ dockerfiles/ubuntu-bionic-all/Dockerfile | 1 + dockerfiles/ubuntu-focal-all/Dockerfile | 1 + dockerfiles/ubuntu-jammy-all/Dockerfile | 1 + dockerfiles/ubuntu-kinetic-all/Dockerfile | 1 + 42 files changed, 77 insertions(+) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index 980544eb..c8e70ae3 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 92ca787f..67a06bb6 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index 5e3a1190..215c3f37 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql13-server postgresql13-devel \ diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index f3b977a8..a47148f1 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 54c690cb..50324962 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index d4f6a2cc..cb4905f3 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index 176fac57..870fdefb 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 90550f5e..96bca2c9 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index 4373e782..a085fb9d 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql13-server postgresql13-devel \ diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index 2a59d903..8663ab30 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index b7e9b4e6..cac0e856 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index 9549de0e..c20f0474 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache rpmdevtools krb5-devel \ && ( [[ 9 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index 1d269f00..25890cad 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index 45cfbb81..efe1b501 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 2b727aa8..20d33ead 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql13-server postgresql13-devel \ diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index f947c2ec..5ea62552 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 81ce2c82..23ceedd7 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index f7cb4769..2bb945d2 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index 8b3aeb6f..f679cb38 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main 16' > postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index a9b7b20e..9b83af15 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main 16' > postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 0ccc418f..684b88b2 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main 16' > /e postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index 767afd0f..b6b2babc 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 6 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index fe1a1c1f..7230bfda 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 6 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index c8a325d0..726e99cc 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 6 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index ddf6690d..216541ca 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 6 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index 30c01b93..6a507d7c 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 6 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index dc15018a..23ae8833 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index 38c245b7..aa1b8144 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 8b166b9a..714a5ad5 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql13-server postgresql13-devel \ diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index 8e81ad28..f46a2079 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index f45572cf..c8becf85 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index 19bb6ba9..df79db34 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset-7-clang llvm5.0 spectool curl \ && ( [[ 7 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 8296f1f4..e618e268 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql11-server postgresql11-devel \ diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index 702d42fd..d795bfb0 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql12-server postgresql12-devel \ diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index da12a1a5..930df1e8 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql13-server postgresql13-devel \ diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index 680cc5a3..c586934c 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql14-server postgresql14-devel \ diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index aa875e9d..96c6b183 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql15-server postgresql15-devel \ diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 2723c68b..1fac79e8 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -98,6 +98,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 tar \ libzstd \ libzstd-devel \ + python3-pip \ + python3-devel \ llvm-toolset ccache spectool curl \ && ( [[ 8 != 8 ]] || dnf -qy module disable postgresql ) \ && yum install -y postgresql16-server postgresql16-devel \ diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index 3bd8bca5..dcbbbe40 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main 16' > /e postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index 5d5a5190..d8a6d304 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main 16' > /et postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index bb82dc38..be89b5a6 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main 16' > /et postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile index 6a1b5fa6..ac289ef0 100644 --- a/dockerfiles/ubuntu-kinetic-all/Dockerfile +++ b/dockerfiles/ubuntu-kinetic-all/Dockerfile @@ -73,6 +73,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ kinetic-pgdg main 16' > / postgresql-server-dev-16 \ wget \ zlib1g-dev \ + python3-dev \ python3-pip \ python3-sphinx \ python3-setuptools \ From face285e2e544e27896041687e698000ca6c81f2 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 00:43:54 +0100 Subject: [PATCH 03/21] don't use testing repositories for pg16, it's released --- dockerfiles/almalinux-8-pg11/Dockerfile | 1 - dockerfiles/almalinux-8-pg12/Dockerfile | 1 - dockerfiles/almalinux-8-pg13/Dockerfile | 1 - dockerfiles/almalinux-8-pg14/Dockerfile | 1 - dockerfiles/almalinux-8-pg15/Dockerfile | 1 - dockerfiles/almalinux-8-pg16/Dockerfile | 1 - dockerfiles/almalinux-9-pg11/Dockerfile | 1 - dockerfiles/almalinux-9-pg12/Dockerfile | 1 - dockerfiles/almalinux-9-pg13/Dockerfile | 1 - dockerfiles/almalinux-9-pg14/Dockerfile | 1 - dockerfiles/almalinux-9-pg15/Dockerfile | 1 - dockerfiles/almalinux-9-pg16/Dockerfile | 1 - dockerfiles/centos-7-pg11/Dockerfile | 1 - dockerfiles/centos-7-pg12/Dockerfile | 1 - dockerfiles/centos-7-pg13/Dockerfile | 1 - dockerfiles/centos-7-pg14/Dockerfile | 1 - dockerfiles/centos-7-pg15/Dockerfile | 1 - dockerfiles/centos-7-pg16/Dockerfile | 1 - dockerfiles/oraclelinux-6-pg11/Dockerfile | 1 - dockerfiles/oraclelinux-6-pg12/Dockerfile | 1 - dockerfiles/oraclelinux-6-pg14/Dockerfile | 1 - dockerfiles/oraclelinux-6-pg15/Dockerfile | 1 - dockerfiles/oraclelinux-6-pg16/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg11/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg12/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg13/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg14/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg15/Dockerfile | 1 - dockerfiles/oraclelinux-7-pg16/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg11/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg12/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg13/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg14/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg15/Dockerfile | 1 - dockerfiles/oraclelinux-8-pg16/Dockerfile | 1 - templates/Dockerfile-rpm.tmpl | 1 - 36 files changed, 36 deletions(-) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index c8e70ae3..9d5a370e 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 67a06bb6..6e3c8b83 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index 215c3f37..ecffab17 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 13 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index a47148f1..e69e8674 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 50324962..78de1847 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index cb4905f3..69db96f4 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index 870fdefb..eb8e01cc 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 96bca2c9..50f5f330 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index a085fb9d..b549ff35 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 13 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index 8663ab30..c51a12c5 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index cac0e856..22ef8b97 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index c20f0474..f0a81189 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ almalinux == oraclelinux ]] && [[ 9 == 7 ]]; then yum install -y wge # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release" ]] || yum install -y epel-release) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index 25890cad..6cc0ef3c 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index efe1b501..d0a06796 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 20d33ead..18c9f711 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 13 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index 5ea62552..cce55957 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 23ceedd7..7f6863c9 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index 2bb945d2..e176ee62 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ centos == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y wget \ # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "epel-release centos-release-scl-rh" ]] || yum install -y epel-release centos-release-scl-rh) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index b6b2babc..4bc8d8e2 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 6 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index 7230bfda..798bba14 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 6 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index 726e99cc..acc3c086 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 6 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index 216541ca..5fb7bad5 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 6 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index 6a507d7c..ed9c9694 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 6 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index 23ae8833..d4209e24 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index aa1b8144..6271b4f8 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 714a5ad5..9be9a255 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 13 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index f46a2079..c824596d 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index c8becf85..b7d76ec9 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index df79db34..b4857403 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 7 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "" ]] || yum install -y ) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index e618e268..4239dacc 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 11 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index d795bfb0..0fdc95b5 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 12 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index 930df1e8..fc15659d 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 13 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index c586934c..f3257050 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 14 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index 96c6b183..ee66149b 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 15 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 1fac79e8..7838d9c9 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -75,7 +75,6 @@ RUN if [[ oraclelinux == oraclelinux ]] && [[ 8 == 7 ]]; then yum install -y w # install build tools and PostgreSQL development files RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm \ - && ( [[ 16 != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "oracle-epel-release-el8" ]] || yum install -y oracle-epel-release-el8) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index 7778935d..274da0da 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -75,7 +75,6 @@ RUN if [[ %%os%% == oraclelinux ]] && [[ %%release%% == 7 ]]; then yum install # install build tools and PostgreSQL development files RUN ( yum install -y https://%%rpm_url%% \ - && ( [[ %%pgshort%% != 16 ]] || sed -i '/\[pgdg16-updates-testing\]/{n;n;n;s/.*/enabled=1/}' /etc/yum.repos.d/pgdg-redhat-all.repo ) \ && [[ -z "%%extra-repositories%%" ]] || yum install -y %%extra-repositories%%) \ && yum groupinstall -y 'Development Tools' \ && yum install -y \ From e667d3daf31cfa7b54d508de23bfcb575185b68f Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 01:16:23 +0100 Subject: [PATCH 04/21] install wheel --- dockerfiles/almalinux-8-pg11/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg12/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg13/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg14/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg15/Dockerfile | 2 ++ dockerfiles/almalinux-8-pg16/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg11/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg12/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg13/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg14/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg15/Dockerfile | 2 ++ dockerfiles/almalinux-9-pg16/Dockerfile | 2 ++ dockerfiles/centos-7-pg11/Dockerfile | 2 ++ dockerfiles/centos-7-pg12/Dockerfile | 2 ++ dockerfiles/centos-7-pg13/Dockerfile | 2 ++ dockerfiles/centos-7-pg14/Dockerfile | 2 ++ dockerfiles/centos-7-pg15/Dockerfile | 2 ++ dockerfiles/centos-7-pg16/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-6-pg16/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg13/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-7-pg16/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg11/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg12/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg13/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg14/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg15/Dockerfile | 2 ++ dockerfiles/oraclelinux-8-pg16/Dockerfile | 2 ++ templates/Dockerfile-rpm.tmpl | 2 ++ 36 files changed, 72 insertions(+) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index 9d5a370e..bc8fa173 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 6e3c8b83..1847a910 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index ecffab17..03a2028f 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index e69e8674..fec500bd 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 78de1847..11f49e25 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index 69db96f4..bac6637e 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index eb8e01cc..7486e409 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 50f5f330..e9feb53b 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index b549ff35..04c9dcc0 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index c51a12c5..7414515e 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index 22ef8b97..327eee1a 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index f0a81189..eebd15cb 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index 6cc0ef3c..e6db972f 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index d0a06796..72969886 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 18c9f711..7e143d65 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index cce55957..1422fa90 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 7f6863c9..61fe6309 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index e176ee62..7b016ae8 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index 4bc8d8e2..d50f5462 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index 798bba14..0817f38c 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index acc3c086..e627ba13 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index 5fb7bad5..b5b27035 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index ed9c9694..f255a6a8 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index d4209e24..1b72eaea 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index 6271b4f8..9a7a5096 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 9be9a255..65b3e6d1 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index c824596d..97f1efa3 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index b7d76ec9..62a26cc4 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index b4857403..cf976b4e 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 4239dacc..4893f035 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index 0fdc95b5..02b6eae3 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index fc15659d..a98dc776 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index f3257050..a87e9a52 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index ee66149b..dae74a7c 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 7838d9c9..85204e80 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -104,6 +104,8 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index 274da0da..79bf82fa 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -104,6 +104,8 @@ RUN ( yum install -y https://%%rpm_url%% \ && yum install -y postgresql%%pgshort%%-server postgresql%%pgshort%%-devel \ && yum clean all +RUN python3 -m pip install wheel + # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ From 4f3da98e5184bc307e17690f3280f2361ddf6407 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 01:19:52 +0100 Subject: [PATCH 05/21] install citus_tools --- dockerfiles/almalinux-8-pg11/Dockerfile | 4 ++++ dockerfiles/almalinux-8-pg12/Dockerfile | 4 ++++ dockerfiles/almalinux-8-pg13/Dockerfile | 4 ++++ dockerfiles/almalinux-8-pg14/Dockerfile | 4 ++++ dockerfiles/almalinux-8-pg15/Dockerfile | 4 ++++ dockerfiles/almalinux-8-pg16/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg11/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg12/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg13/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg14/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg15/Dockerfile | 4 ++++ dockerfiles/almalinux-9-pg16/Dockerfile | 4 ++++ dockerfiles/centos-7-pg11/Dockerfile | 4 ++++ dockerfiles/centos-7-pg12/Dockerfile | 4 ++++ dockerfiles/centos-7-pg13/Dockerfile | 4 ++++ dockerfiles/centos-7-pg14/Dockerfile | 4 ++++ dockerfiles/centos-7-pg15/Dockerfile | 4 ++++ dockerfiles/centos-7-pg16/Dockerfile | 4 ++++ dockerfiles/debian-bookworm-all/Dockerfile | 4 ++++ dockerfiles/debian-bullseye-all/Dockerfile | 4 ++++ dockerfiles/debian-buster-all/Dockerfile | 4 ++++ dockerfiles/oraclelinux-6-pg11/Dockerfile | 4 ++++ dockerfiles/oraclelinux-6-pg12/Dockerfile | 4 ++++ dockerfiles/oraclelinux-6-pg14/Dockerfile | 4 ++++ dockerfiles/oraclelinux-6-pg15/Dockerfile | 4 ++++ dockerfiles/oraclelinux-6-pg16/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg11/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg12/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg13/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg14/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg15/Dockerfile | 4 ++++ dockerfiles/oraclelinux-7-pg16/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg11/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg12/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg13/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg14/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg15/Dockerfile | 4 ++++ dockerfiles/oraclelinux-8-pg16/Dockerfile | 4 ++++ dockerfiles/ubuntu-bionic-all/Dockerfile | 4 ++++ dockerfiles/ubuntu-focal-all/Dockerfile | 4 ++++ dockerfiles/ubuntu-jammy-all/Dockerfile | 4 ++++ dockerfiles/ubuntu-kinetic-all/Dockerfile | 4 ++++ templates/Dockerfile-deb.tmpl | 4 ++++ templates/Dockerfile-rpm.tmpl | 4 ++++ 44 files changed, 176 insertions(+) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index bc8fa173..21bbce56 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 1847a910..884687f5 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index 03a2028f..a4292558 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=13 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index fec500bd..81368b00 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 11f49e25..691cc58a 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index bac6637e..67e191ac 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index 7486e409..159c0f7b 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index e9feb53b..4d6a2e7f 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index 04c9dcc0..12201fd5 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=13 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index 7414515e..dd0fa2b1 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index 327eee1a..a40bd790 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index eebd15cb..aaeff023 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index e6db972f..b9652333 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index 72969886..a2b582e7 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 7e143d65..d52114ba 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=13 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index 1422fa90..66498815 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 61fe6309..812de10d 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index 7b016ae8..d3736e4b 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index f679cb38..4735f30f 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index 9b83af15..48335d98 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 684b88b2..1255a7c7 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index d50f5462..b9245c08 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index 0817f38c..1a58f5e4 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index e627ba13..0d1d7312 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index b5b27035..f2c7302b 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index f255a6a8..29c1e2e0 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index 1b72eaea..749b2c86 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index 9a7a5096..570800a8 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 65b3e6d1..34107ff8 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=13 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index 97f1efa3..b2eede63 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index 62a26cc4..b293a032 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index cf976b4e..43e166a8 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 4893f035..3c8666a0 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=11 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index 02b6eae3..c4a476e8 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=12 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index a98dc776..91a35b9a 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=13 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index a87e9a52..f650652c 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=14 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index dae74a7c..5173fe1f 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=15 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 85204e80..e02d42a9 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -174,4 +174,8 @@ ENV PGVERSION=16 \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index dcbbbe40..2ad0e2f9 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index d8a6d304..6e18874a 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index be89b5a6..aecd4558 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile index ac289ef0..5d9785ca 100644 --- a/dockerfiles/ubuntu-kinetic-all/Dockerfile +++ b/dockerfiles/ubuntu-kinetic-all/Dockerfile @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index 15707881..e045f046 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -140,4 +140,8 @@ ENV PATH /scripts:$PATH COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index 79bf82fa..984e3966 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -174,4 +174,8 @@ ENV PGVERSION=%%pgversion%% \ COPY scripts /scripts VOLUME /packages +# add citus tools +RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools +RUN python3 -m pip install -r tools/packaging_automation/requirements.txt + ENTRYPOINT ["/scripts/fetch_and_build_rpm"] From af08fbf3348f868bdef66cae3cda3ccaf74e66bd Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 01:26:24 +0100 Subject: [PATCH 06/21] cleanup workflows, somewhat --- .github/workflows/build-citus-community-nightlies.yml | 3 --- .github/workflows/build-package-test.yml | 4 ++-- .github/workflows/build-package.yml | 2 +- .github/workflows/image-health-check.yml | 6 +----- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-citus-community-nightlies.yml b/.github/workflows/build-citus-community-nightlies.yml index d7b55fb7..fca21f5b 100644 --- a/.github/workflows/build-citus-community-nightlies.yml +++ b/.github/workflows/build-citus-community-nightlies.yml @@ -10,9 +10,6 @@ env: DOCKERHUB_USER_NAME: ${{ secrets.DOCKERHUB_USER_NAME }} DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} on: - push: - branches: - - "**" schedule: - cron: "30 1 * * *" workflow_dispatch: diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 115cd985..2cbcf190 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -12,8 +12,8 @@ env: CURRENT_BRANCH: ${GITHUB_REF##*/} TEST: true on: - push: - branches: "**" + pull_request: + types: [opened, reopened,synchronize] workflow_dispatch: concurrency: diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 4fc9f704..209fbf3d 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -13,7 +13,7 @@ env: TEST: false on: push: - branches: "**" + branches: "develop" workflow_dispatch: concurrency: diff --git a/.github/workflows/image-health-check.yml b/.github/workflows/image-health-check.yml index a3eaa753..9d3e2bfe 100644 --- a/.github/workflows/image-health-check.yml +++ b/.github/workflows/image-health-check.yml @@ -82,13 +82,9 @@ jobs: env: TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }} POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} - - - name: Clone tools repo for test - run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools - + # TODO we should probably fold this into the image building thing, to verify if images are built correctly before pushing - name: Execute packaging tests run: | - python -m pip install -r tools/packaging_automation/requirements.txt python -m pytest -q tools/packaging_automation/tests/test_citus_package.py -k 'test_build_packages' env: PACKAGING_IMAGE_PLATFORM: "${{matrix.TARGET_PLATFORM}}" From 79a60d78307d091527fa4f12f34255cd4f96a2c4 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 01:48:52 +0100 Subject: [PATCH 07/21] disable image health stuff on every push --- .github/workflows/image-health-check.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/image-health-check.yml b/.github/workflows/image-health-check.yml index 9d3e2bfe..df6c4c10 100644 --- a/.github/workflows/image-health-check.yml +++ b/.github/workflows/image-health-check.yml @@ -12,8 +12,6 @@ env: CURRENT_BRANCH: "${GITHUB_REF##*/}" TEST: false on: - push: - branches: "**" schedule: - cron: "30 2 * * *" workflow_dispatch: From 4bba20efa5b20105bc53a8710ae5846f012f95e4 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 02:25:38 +0100 Subject: [PATCH 08/21] install requirements with pip in a login shell that has the correct shim loaded --- dockerfiles/almalinux-8-pg11/Dockerfile | 2 +- dockerfiles/almalinux-8-pg12/Dockerfile | 2 +- dockerfiles/almalinux-8-pg13/Dockerfile | 2 +- dockerfiles/almalinux-8-pg14/Dockerfile | 2 +- dockerfiles/almalinux-8-pg15/Dockerfile | 2 +- dockerfiles/almalinux-8-pg16/Dockerfile | 2 +- dockerfiles/almalinux-9-pg11/Dockerfile | 2 +- dockerfiles/almalinux-9-pg12/Dockerfile | 2 +- dockerfiles/almalinux-9-pg13/Dockerfile | 2 +- dockerfiles/almalinux-9-pg14/Dockerfile | 2 +- dockerfiles/almalinux-9-pg15/Dockerfile | 2 +- dockerfiles/almalinux-9-pg16/Dockerfile | 2 +- dockerfiles/centos-7-pg11/Dockerfile | 2 +- dockerfiles/centos-7-pg12/Dockerfile | 2 +- dockerfiles/centos-7-pg13/Dockerfile | 2 +- dockerfiles/centos-7-pg14/Dockerfile | 2 +- dockerfiles/centos-7-pg15/Dockerfile | 2 +- dockerfiles/centos-7-pg16/Dockerfile | 2 +- dockerfiles/debian-bookworm-all/Dockerfile | 2 +- dockerfiles/debian-bullseye-all/Dockerfile | 2 +- dockerfiles/debian-buster-all/Dockerfile | 2 +- dockerfiles/oraclelinux-6-pg11/Dockerfile | 2 +- dockerfiles/oraclelinux-6-pg12/Dockerfile | 2 +- dockerfiles/oraclelinux-6-pg14/Dockerfile | 2 +- dockerfiles/oraclelinux-6-pg15/Dockerfile | 2 +- dockerfiles/oraclelinux-6-pg16/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg11/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg12/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg13/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg14/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg15/Dockerfile | 2 +- dockerfiles/oraclelinux-7-pg16/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg11/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg12/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg13/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg14/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg15/Dockerfile | 2 +- dockerfiles/oraclelinux-8-pg16/Dockerfile | 2 +- dockerfiles/ubuntu-bionic-all/Dockerfile | 2 +- dockerfiles/ubuntu-focal-all/Dockerfile | 2 +- dockerfiles/ubuntu-jammy-all/Dockerfile | 2 +- dockerfiles/ubuntu-kinetic-all/Dockerfile | 2 +- templates/Dockerfile-deb.tmpl | 2 +- templates/Dockerfile-rpm.tmpl | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index 21bbce56..434b4f43 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 884687f5..045c4360 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index a4292558..ddc89ce3 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index 81368b00..37d5c15a 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 691cc58a..11d5e85c 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index 67e191ac..5854951b 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index 159c0f7b..92c58639 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 4d6a2e7f..32425077 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index 12201fd5..42ac4c3d 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index dd0fa2b1..167c4b91 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index a40bd790..4dd7eac5 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index aaeff023..9463cd56 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index b9652333..359a47ed 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index a2b582e7..78555f00 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index d52114ba..52db1407 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index 66498815..5ced06e2 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 812de10d..cb8e9bc4 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index d3736e4b..cd814917 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index 4735f30f..c76a788d 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index 48335d98..dd7786a7 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 1255a7c7..09a0dbd5 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index b9245c08..82c28218 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index 1a58f5e4..fe4f451c 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index 0d1d7312..08aa58c1 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index f2c7302b..5931b30f 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index 29c1e2e0..07a46070 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index 749b2c86..f4aad8af 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index 570800a8..9518afa5 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 34107ff8..00328db6 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index b2eede63..df149d8f 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index b293a032..f68eb2dd 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index 43e166a8..7d54c168 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 3c8666a0..664ed7ea 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index c4a476e8..06cd39f8 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index 91a35b9a..262bf895 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index f650652c..6e99ed87 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index 5173fe1f..5c41b32e 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index e02d42a9..10d8f7ff 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index 2ad0e2f9..18d780cf 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index 6e18874a..4b5ff649 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index aecd4558..b2045e49 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile index 5d9785ca..d0084e95 100644 --- a/dockerfiles/ubuntu-kinetic-all/Dockerfile +++ b/dockerfiles/ubuntu-kinetic-all/Dockerfile @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index e045f046..98ceb3e4 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -142,6 +142,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index 984e3966..eb4ae8f8 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -176,6 +176,6 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN python3 -m pip install -r tools/packaging_automation/requirements.txt +RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' ENTRYPOINT ["/scripts/fetch_and_build_rpm"] From 0e94697d093b54f3ec8f38afed71153c7cbd3e65 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 13:11:50 +0100 Subject: [PATCH 09/21] speedup image build for testing --- .github/workflows/build-package-test.yml | 82 +++++++++++------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 2cbcf190..0de15084 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -40,11 +40,11 @@ jobs: fail-fast: false matrix: TARGET_PLATFORM: - - centos,7 - - oraclelinux,8 - - oraclelinux,7 - - almalinux,8 - - almalinux,9 + - centos-7 + - oraclelinux-8 + - oraclelinux-7 + - almalinux-8 + - almalinux-9 POSTGRES_VERSION: - 11 - 12 @@ -53,48 +53,42 @@ jobs: - 15 - 16 include: - - TARGET_PLATFORM: debian,buster - - TARGET_PLATFORM: debian,bullseye - - TARGET_PLATFORM: debian,bookworm + - TARGET_PLATFORM: debian-buster + - TARGET_PLATFORM: debian-bullseye + - TARGET_PLATFORM: debian-bookworm # removing temporarily since postgres 16 packages does not exist for ubuntu bionic - # - TARGET_PLATFORM: ubuntu,bionic - - TARGET_PLATFORM: ubuntu,focal - - TARGET_PLATFORM: ubuntu,jammy - - TARGET_PLATFORM: ubuntu,kinetic - - TARGET_PLATFORM: pgxn + # - TARGET_PLATFORM: ubuntu-bionic + - TARGET_PLATFORM: ubuntu-focal + - TARGET_PLATFORM: ubuntu-jammy + - TARGET_PLATFORM: ubuntu-kinetic + # - TARGET_PLATFORM: pgxn steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - - name: Install package dependencies - run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources + - name: 'Login to GitHub Container Registry' + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{github.actor}} + password: ${{secrets.GITHUB_TOKEN}} - - name: Install wheel for el/8 - if: matrix.TARGET_PLATFORM == 'centos,8' - run: python -m pip install wheel - - - name: Build image for the target platform - run: | - git checkout -- dockerfiles - ./update_image - env: - TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }} - POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} + - name: Build and push + uses: docker/build-push-action@v4 + with: + file: dockerfiles/${{ matrix.TARGET_PLATFORM }}-pg${{ matrix.POSTGRES_VERSION }}/Dockerfile + pull: true + push: false + tags: ghcr.io/citusdata/packaging-test:${{ matrix.TARGET_PLATFORM }}-pg${{ matrix.POSTGRES_VERSION }} + cache-from: type=gha + cache-to: type=gha,mode=max - - name: Clone tools repo for test - run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools + # - name: Clone tools repo for test + # run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools - - name: Execute packaging tests - run: | - python -m pip install -r tools/packaging_automation/requirements.txt - python -m pytest -q tools/packaging_automation/tests/test_citus_package.py -k 'test_build_packages' - env: - PACKAGING_IMAGE_PLATFORM: "${{matrix.TARGET_PLATFORM}}" - - - name: Push images - run: | - export CURRENT_BRANCH=${GITHUB_REF##*/} - ./ci/push_images - env: - TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }} - POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} + # - name: Execute packaging tests + # run: | + # python -m pip install -r tools/packaging_automation/requirements.txt + # python -m pytest -q tools/packaging_automation/tests/test_citus_package.py -k 'test_build_packages' + # env: + # PACKAGING_IMAGE_PLATFORM: "${{matrix.TARGET_PLATFORM}}" From 840f07fe3674d8504e6d7f5124dafcd7cd829c52 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 13:20:09 +0100 Subject: [PATCH 10/21] build debians correctly --- .github/workflows/build-package-test.yml | 30 +++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 0de15084..2edd8bf8 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -46,22 +46,34 @@ jobs: - almalinux-8 - almalinux-9 POSTGRES_VERSION: - - 11 - - 12 - - 13 - - 14 - - 15 - - 16 + - pg11 + - pg12 + - pg13 + - pg14 + - pg15 + - pg16 + exclude: + - TARGET_PLATFORM: centos-7 + POSTGRES_VERSION: pg16 + - TARGET_PLATFORM: oraclelinux-7 + POSTGRES_VERSION: pg16 include: - TARGET_PLATFORM: debian-buster + POSTGRES_VERSION: all - TARGET_PLATFORM: debian-bullseye + POSTGRES_VERSION: all - TARGET_PLATFORM: debian-bookworm + POSTGRES_VERSION: all # removing temporarily since postgres 16 packages does not exist for ubuntu bionic # - TARGET_PLATFORM: ubuntu-bionic - TARGET_PLATFORM: ubuntu-focal + POSTGRES_VERSION: all - TARGET_PLATFORM: ubuntu-jammy + POSTGRES_VERSION: all - TARGET_PLATFORM: ubuntu-kinetic - # - TARGET_PLATFORM: pgxn + POSTGRES_VERSION: all + - TARGET_PLATFORM: pgxn + POSTGRES_VERSION: all steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -76,10 +88,10 @@ jobs: - name: Build and push uses: docker/build-push-action@v4 with: - file: dockerfiles/${{ matrix.TARGET_PLATFORM }}-pg${{ matrix.POSTGRES_VERSION }}/Dockerfile + file: dockerfiles/${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }}/Dockerfile pull: true push: false - tags: ghcr.io/citusdata/packaging-test:${{ matrix.TARGET_PLATFORM }}-pg${{ matrix.POSTGRES_VERSION }} + tags: ghcr.io/citusdata/packaging-test:${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }} cache-from: type=gha cache-to: type=gha,mode=max From 0c83c5517614c6facc0afc721d64cb257a42cf3b Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:05:34 +0100 Subject: [PATCH 11/21] slimdown matrix to make use of caching --- .github/workflows/build-package-test.yml | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 2edd8bf8..e2688b6f 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -40,17 +40,17 @@ jobs: fail-fast: false matrix: TARGET_PLATFORM: - - centos-7 - - oraclelinux-8 - - oraclelinux-7 - - almalinux-8 + # - centos-7 + # - oraclelinux-8 + # - oraclelinux-7 + # - almalinux-8 - almalinux-9 POSTGRES_VERSION: - - pg11 - - pg12 - - pg13 - - pg14 - - pg15 + # - pg11 + # - pg12 + # - pg13 + # - pg14 + # - pg15 - pg16 exclude: - TARGET_PLATFORM: centos-7 @@ -58,35 +58,35 @@ jobs: - TARGET_PLATFORM: oraclelinux-7 POSTGRES_VERSION: pg16 include: - - TARGET_PLATFORM: debian-buster - POSTGRES_VERSION: all - - TARGET_PLATFORM: debian-bullseye - POSTGRES_VERSION: all - - TARGET_PLATFORM: debian-bookworm - POSTGRES_VERSION: all - # removing temporarily since postgres 16 packages does not exist for ubuntu bionic + # - TARGET_PLATFORM: debian-buster + # POSTGRES_VERSION: all + # - TARGET_PLATFORM: debian-bullseye + # POSTGRES_VERSION: all + # - TARGET_PLATFORM: debian-bookworm + # POSTGRES_VERSION: all # - TARGET_PLATFORM: ubuntu-bionic - - TARGET_PLATFORM: ubuntu-focal - POSTGRES_VERSION: all + # POSTGRES_VERSION: all + # - TARGET_PLATFORM: ubuntu-focal + # POSTGRES_VERSION: all - TARGET_PLATFORM: ubuntu-jammy POSTGRES_VERSION: all - - TARGET_PLATFORM: ubuntu-kinetic - POSTGRES_VERSION: all - - TARGET_PLATFORM: pgxn - POSTGRES_VERSION: all + # - TARGET_PLATFORM: ubuntu-kinetic + # POSTGRES_VERSION: all + # - TARGET_PLATFORM: pgxn + # POSTGRES_VERSION: all steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{github.actor}} password: ${{secrets.GITHUB_TOKEN}} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: file: dockerfiles/${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }}/Dockerfile pull: true From 9123802bf2d6b481ab6d4e2e3caacdf991584666 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:09:54 +0100 Subject: [PATCH 12/21] compile cmake with all cores available --- dockerfiles/ubuntu-jammy-all/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index b2045e49..43c7746a 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 From 765acfb2d5af0552dffcf20bf675789caf4bf817 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:14:00 +0100 Subject: [PATCH 13/21] now from template --- dockerfiles/debian-bookworm-all/Dockerfile | 4 ++-- dockerfiles/debian-bullseye-all/Dockerfile | 4 ++-- dockerfiles/debian-buster-all/Dockerfile | 4 ++-- dockerfiles/ubuntu-bionic-all/Dockerfile | 4 ++-- dockerfiles/ubuntu-focal-all/Dockerfile | 4 ++-- dockerfiles/ubuntu-kinetic-all/Dockerfile | 4 ++-- templates/Dockerfile-deb.tmpl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index c76a788d..c4d34ef6 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index dd7786a7..4fe6edce 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 09a0dbd5..7b99feff 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index 18d780cf..aab38534 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index 4b5ff649..598888fe 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile index d0084e95..41c61390 100644 --- a/dockerfiles/ubuntu-kinetic-all/Dockerfile +++ b/dockerfiles/ubuntu-kinetic-all/Dockerfile @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index 98ceb3e4..326b48e9 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -113,8 +113,8 @@ RUN patch `which pg_buildext` < /make_pg_buildext_parallel.patch RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz && \ tar -zxvf cmake-3.22.2.tar.gz && \ cd cmake-3.22.2 && ./bootstrap && \ - make && \ - make install && \ + MAKEFLAGS="-j $(nproc)" make && \ + MAKEFLAGS="-j $(nproc)" make install && \ rm -f cmake-3.22.2.tar.gz && \ rm -rf cmake-3.22.2 From 21562756c592066de7224c87c9d2d1d672d12986 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:15:06 +0100 Subject: [PATCH 14/21] push images to github container registry --- .github/workflows/build-package-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index e2688b6f..9a84e05c 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -90,7 +90,7 @@ jobs: with: file: dockerfiles/${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }}/Dockerfile pull: true - push: false + push: true tags: ghcr.io/citusdata/packaging-test:${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }} cache-from: type=gha cache-to: type=gha,mode=max From b54f76014f42596ce1b9ad9ce40142227248b56a Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:28:37 +0100 Subject: [PATCH 15/21] only ubuntu --- .github/workflows/build-package-test.yml | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 9a84e05c..9a0a3692 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -39,24 +39,24 @@ jobs: strategy: fail-fast: false matrix: - TARGET_PLATFORM: - # - centos-7 - # - oraclelinux-8 - # - oraclelinux-7 - # - almalinux-8 - - almalinux-9 - POSTGRES_VERSION: - # - pg11 - # - pg12 - # - pg13 - # - pg14 - # - pg15 - - pg16 - exclude: - - TARGET_PLATFORM: centos-7 - POSTGRES_VERSION: pg16 - - TARGET_PLATFORM: oraclelinux-7 - POSTGRES_VERSION: pg16 + # TARGET_PLATFORM: + # - centos-7 + # - oraclelinux-8 + # - oraclelinux-7 + # - almalinux-8 + # - almalinux-9 + # POSTGRES_VERSION: + # - pg11 + # - pg12 + # - pg13 + # - pg14 + # - pg15 + # - pg16 + # exclude: + # - TARGET_PLATFORM: centos-7 + # POSTGRES_VERSION: pg16 + # - TARGET_PLATFORM: oraclelinux-7 + # POSTGRES_VERSION: pg16 include: # - TARGET_PLATFORM: debian-buster # POSTGRES_VERSION: all From 08f5d08e5828f7b23eeab1bb29ab5c9f2b263d9b Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:11:27 +0100 Subject: [PATCH 16/21] install package in pyenv --- dockerfiles/ubuntu-jammy-all/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index 43c7746a..62744dd1 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] From 6308ca65edd47a71b59d63ba6fb4be2650ee4923 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:12:32 +0100 Subject: [PATCH 17/21] update images --- dockerfiles/debian-bookworm-all/Dockerfile | 3 ++- dockerfiles/debian-bullseye-all/Dockerfile | 3 ++- dockerfiles/debian-buster-all/Dockerfile | 3 ++- dockerfiles/ubuntu-bionic-all/Dockerfile | 3 ++- dockerfiles/ubuntu-focal-all/Dockerfile | 3 ++- dockerfiles/ubuntu-kinetic-all/Dockerfile | 3 ++- templates/Dockerfile-deb.tmpl | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index c4d34ef6..9089bcc9 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index 4fe6edce..a84e48a8 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 7b99feff..fd5e30de 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index aab38534..e01d72fb 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index 598888fe..12e03a97 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/dockerfiles/ubuntu-kinetic-all/Dockerfile b/dockerfiles/ubuntu-kinetic-all/Dockerfile index 41c61390..d6ce495e 100644 --- a/dockerfiles/ubuntu-kinetic-all/Dockerfile +++ b/dockerfiles/ubuntu-kinetic-all/Dockerfile @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index 326b48e9..79ade27c 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -142,6 +142,7 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" ENTRYPOINT ["/scripts/fetch_and_build_deb"] From adfe73f37634a2f235cb93a90c13affe2d5f5b9e Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:29:34 +0100 Subject: [PATCH 18/21] create pyenv for rpm based systems --- dockerfiles/almalinux-8-pg11/Dockerfile | 4 +++- dockerfiles/almalinux-8-pg12/Dockerfile | 4 +++- dockerfiles/almalinux-8-pg13/Dockerfile | 4 +++- dockerfiles/almalinux-8-pg14/Dockerfile | 4 +++- dockerfiles/almalinux-8-pg15/Dockerfile | 4 +++- dockerfiles/almalinux-8-pg16/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg11/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg12/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg13/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg14/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg15/Dockerfile | 4 +++- dockerfiles/almalinux-9-pg16/Dockerfile | 4 +++- dockerfiles/centos-7-pg11/Dockerfile | 4 +++- dockerfiles/centos-7-pg12/Dockerfile | 4 +++- dockerfiles/centos-7-pg13/Dockerfile | 4 +++- dockerfiles/centos-7-pg14/Dockerfile | 4 +++- dockerfiles/centos-7-pg15/Dockerfile | 4 +++- dockerfiles/centos-7-pg16/Dockerfile | 4 +++- dockerfiles/oraclelinux-6-pg11/Dockerfile | 4 +++- dockerfiles/oraclelinux-6-pg12/Dockerfile | 4 +++- dockerfiles/oraclelinux-6-pg14/Dockerfile | 4 +++- dockerfiles/oraclelinux-6-pg15/Dockerfile | 4 +++- dockerfiles/oraclelinux-6-pg16/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg11/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg12/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg13/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg14/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg15/Dockerfile | 4 +++- dockerfiles/oraclelinux-7-pg16/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg11/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg12/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg13/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg14/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg15/Dockerfile | 4 +++- dockerfiles/oraclelinux-8-pg16/Dockerfile | 4 +++- templates/Dockerfile-rpm.tmpl | 4 +++- 36 files changed, 108 insertions(+), 36 deletions(-) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index 434b4f43..7b0d3479 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 045c4360..43b43aa1 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index ddc89ce3..c25eddca 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index 37d5c15a..9f353b33 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index 11d5e85c..b5847088 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index 5854951b..3b201068 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index 92c58639..ef600657 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 32425077..31c54302 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index 42ac4c3d..82b0da6b 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index 167c4b91..c0483bc0 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index 4dd7eac5..d63793ea 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index 9463cd56..3d228379 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 9 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index 359a47ed..fc9dca2b 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index 78555f00..0cab180a 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 52db1407..816b6fba 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index 5ced06e2..c968d9c6 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index cb8e9bc4..6726e780 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index cd814917..9687d041 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index 82c28218..8d192322 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 6 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index fe4f451c..a5678be8 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 6 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index 08aa58c1..2b4a9dcb 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 6 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index 5931b30f..f39c6685 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 6 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index 07a46070..cf7670cb 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 6 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index f4aad8af..5b4db62f 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index 9518afa5..f55eeb9e 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index 00328db6..c00dbe3d 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index df149d8f..9e3401a0 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index f68eb2dd..8ced6d60 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index 7d54c168..26edfc43 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 7 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 664ed7ea..8f733aff 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index 06cd39f8..086f6c99 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index 262bf895..1fd3574a 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index 6e99ed87..caf1eb63 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index 5c41b32e..9538d545 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 10d8f7ff..1168b1cb 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ 8 != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index eb4ae8f8..fb59d256 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -176,6 +176,8 @@ VOLUME /packages # add citus tools RUN git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools -RUN bash -l -c 'pip install -r tools/packaging_automation/requirements.txt' +RUN export PATH="$HOME/.pyenv/bin:$PATH" \ + && bash -l -c "$(pyenv init -) && pyenv virtualenv ${PYTHON_VERSION} packaging_env && pyenv activate packaging_env && pip install -r tools/packaging_automation/requirements.txt" \ + && ([[ %%release%% != 7 ]] || bash -l -c "$(pyenv init -) && pyenv activate packaging_env && pip uninstall -y urllib3 && pip install 'urllib3<2'") ENTRYPOINT ["/scripts/fetch_and_build_rpm"] From ccc881afe29041ca00170371d27aa894f6c3e56b Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:30:30 +0100 Subject: [PATCH 19/21] only build oracle linux --- .github/workflows/build-package-test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index 9a0a3692..d6d9aba4 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -39,25 +39,25 @@ jobs: strategy: fail-fast: false matrix: - # TARGET_PLATFORM: + TARGET_PLATFORM: # - centos-7 # - oraclelinux-8 - # - oraclelinux-7 + - oraclelinux-7 # - almalinux-8 # - almalinux-9 - # POSTGRES_VERSION: - # - pg11 + POSTGRES_VERSION: + # - pg11 # - pg12 # - pg13 # - pg14 - # - pg15 + - pg15 # - pg16 # exclude: # - TARGET_PLATFORM: centos-7 # POSTGRES_VERSION: pg16 # - TARGET_PLATFORM: oraclelinux-7 # POSTGRES_VERSION: pg16 - include: + # include: # - TARGET_PLATFORM: debian-buster # POSTGRES_VERSION: all # - TARGET_PLATFORM: debian-bullseye @@ -68,8 +68,8 @@ jobs: # POSTGRES_VERSION: all # - TARGET_PLATFORM: ubuntu-focal # POSTGRES_VERSION: all - - TARGET_PLATFORM: ubuntu-jammy - POSTGRES_VERSION: all + # - TARGET_PLATFORM: ubuntu-jammy + # POSTGRES_VERSION: all # - TARGET_PLATFORM: ubuntu-kinetic # POSTGRES_VERSION: all # - TARGET_PLATFORM: pgxn From f31f8113763e07606cfe4d24037e5642c3c66939 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:44:32 +0100 Subject: [PATCH 20/21] no wheel --- dockerfiles/almalinux-8-pg11/Dockerfile | 2 -- dockerfiles/almalinux-8-pg12/Dockerfile | 2 -- dockerfiles/almalinux-8-pg13/Dockerfile | 2 -- dockerfiles/almalinux-8-pg14/Dockerfile | 2 -- dockerfiles/almalinux-8-pg15/Dockerfile | 2 -- dockerfiles/almalinux-8-pg16/Dockerfile | 2 -- dockerfiles/almalinux-9-pg11/Dockerfile | 2 -- dockerfiles/almalinux-9-pg12/Dockerfile | 2 -- dockerfiles/almalinux-9-pg13/Dockerfile | 2 -- dockerfiles/almalinux-9-pg14/Dockerfile | 2 -- dockerfiles/almalinux-9-pg15/Dockerfile | 2 -- dockerfiles/almalinux-9-pg16/Dockerfile | 2 -- dockerfiles/centos-7-pg11/Dockerfile | 2 -- dockerfiles/centos-7-pg12/Dockerfile | 2 -- dockerfiles/centos-7-pg13/Dockerfile | 2 -- dockerfiles/centos-7-pg14/Dockerfile | 2 -- dockerfiles/centos-7-pg15/Dockerfile | 2 -- dockerfiles/centos-7-pg16/Dockerfile | 2 -- dockerfiles/oraclelinux-6-pg11/Dockerfile | 2 -- dockerfiles/oraclelinux-6-pg12/Dockerfile | 2 -- dockerfiles/oraclelinux-6-pg14/Dockerfile | 2 -- dockerfiles/oraclelinux-6-pg15/Dockerfile | 2 -- dockerfiles/oraclelinux-6-pg16/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg11/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg12/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg13/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg14/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg15/Dockerfile | 2 -- dockerfiles/oraclelinux-7-pg16/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg11/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg12/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg13/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg14/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg15/Dockerfile | 2 -- dockerfiles/oraclelinux-8-pg16/Dockerfile | 2 -- templates/Dockerfile-rpm.tmpl | 2 -- 36 files changed, 72 deletions(-) diff --git a/dockerfiles/almalinux-8-pg11/Dockerfile b/dockerfiles/almalinux-8-pg11/Dockerfile index 7b0d3479..ae9d5d5b 100644 --- a/dockerfiles/almalinux-8-pg11/Dockerfile +++ b/dockerfiles/almalinux-8-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg12/Dockerfile b/dockerfiles/almalinux-8-pg12/Dockerfile index 43b43aa1..93e48a35 100644 --- a/dockerfiles/almalinux-8-pg12/Dockerfile +++ b/dockerfiles/almalinux-8-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg13/Dockerfile b/dockerfiles/almalinux-8-pg13/Dockerfile index c25eddca..2491263f 100644 --- a/dockerfiles/almalinux-8-pg13/Dockerfile +++ b/dockerfiles/almalinux-8-pg13/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg14/Dockerfile b/dockerfiles/almalinux-8-pg14/Dockerfile index 9f353b33..c89d0695 100644 --- a/dockerfiles/almalinux-8-pg14/Dockerfile +++ b/dockerfiles/almalinux-8-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg15/Dockerfile b/dockerfiles/almalinux-8-pg15/Dockerfile index b5847088..673bc354 100644 --- a/dockerfiles/almalinux-8-pg15/Dockerfile +++ b/dockerfiles/almalinux-8-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-8-pg16/Dockerfile b/dockerfiles/almalinux-8-pg16/Dockerfile index 3b201068..8f20c66a 100644 --- a/dockerfiles/almalinux-8-pg16/Dockerfile +++ b/dockerfiles/almalinux-8-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg11/Dockerfile b/dockerfiles/almalinux-9-pg11/Dockerfile index ef600657..a0da9b23 100644 --- a/dockerfiles/almalinux-9-pg11/Dockerfile +++ b/dockerfiles/almalinux-9-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg12/Dockerfile b/dockerfiles/almalinux-9-pg12/Dockerfile index 31c54302..310fb176 100644 --- a/dockerfiles/almalinux-9-pg12/Dockerfile +++ b/dockerfiles/almalinux-9-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg13/Dockerfile b/dockerfiles/almalinux-9-pg13/Dockerfile index 82b0da6b..a1445dbd 100644 --- a/dockerfiles/almalinux-9-pg13/Dockerfile +++ b/dockerfiles/almalinux-9-pg13/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg14/Dockerfile b/dockerfiles/almalinux-9-pg14/Dockerfile index c0483bc0..96ad0105 100644 --- a/dockerfiles/almalinux-9-pg14/Dockerfile +++ b/dockerfiles/almalinux-9-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg15/Dockerfile b/dockerfiles/almalinux-9-pg15/Dockerfile index d63793ea..a102126b 100644 --- a/dockerfiles/almalinux-9-pg15/Dockerfile +++ b/dockerfiles/almalinux-9-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/almalinux-9-pg16/Dockerfile b/dockerfiles/almalinux-9-pg16/Dockerfile index 3d228379..6a03cd5a 100644 --- a/dockerfiles/almalinux-9-pg16/Dockerfile +++ b/dockerfiles/almalinux-9-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg11/Dockerfile b/dockerfiles/centos-7-pg11/Dockerfile index fc9dca2b..b491b412 100644 --- a/dockerfiles/centos-7-pg11/Dockerfile +++ b/dockerfiles/centos-7-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg12/Dockerfile b/dockerfiles/centos-7-pg12/Dockerfile index 0cab180a..0f7e4b40 100644 --- a/dockerfiles/centos-7-pg12/Dockerfile +++ b/dockerfiles/centos-7-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg13/Dockerfile b/dockerfiles/centos-7-pg13/Dockerfile index 816b6fba..828ba7ac 100644 --- a/dockerfiles/centos-7-pg13/Dockerfile +++ b/dockerfiles/centos-7-pg13/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg14/Dockerfile b/dockerfiles/centos-7-pg14/Dockerfile index c968d9c6..74eca28a 100644 --- a/dockerfiles/centos-7-pg14/Dockerfile +++ b/dockerfiles/centos-7-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg15/Dockerfile b/dockerfiles/centos-7-pg15/Dockerfile index 6726e780..bf8d3d36 100644 --- a/dockerfiles/centos-7-pg15/Dockerfile +++ b/dockerfiles/centos-7-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/centos-7-pg16/Dockerfile b/dockerfiles/centos-7-pg16/Dockerfile index 9687d041..53f7f075 100644 --- a/dockerfiles/centos-7-pg16/Dockerfile +++ b/dockerfiles/centos-7-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg11/Dockerfile b/dockerfiles/oraclelinux-6-pg11/Dockerfile index 8d192322..44b15b80 100644 --- a/dockerfiles/oraclelinux-6-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg12/Dockerfile b/dockerfiles/oraclelinux-6-pg12/Dockerfile index a5678be8..b955f2f6 100644 --- a/dockerfiles/oraclelinux-6-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg14/Dockerfile b/dockerfiles/oraclelinux-6-pg14/Dockerfile index 2b4a9dcb..f3958978 100644 --- a/dockerfiles/oraclelinux-6-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg15/Dockerfile b/dockerfiles/oraclelinux-6-pg15/Dockerfile index f39c6685..d8405743 100644 --- a/dockerfiles/oraclelinux-6-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-6-pg16/Dockerfile b/dockerfiles/oraclelinux-6-pg16/Dockerfile index cf7670cb..f05b2221 100644 --- a/dockerfiles/oraclelinux-6-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-6-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-6 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg11/Dockerfile b/dockerfiles/oraclelinux-7-pg11/Dockerfile index 5b4db62f..de15ad66 100644 --- a/dockerfiles/oraclelinux-7-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg12/Dockerfile b/dockerfiles/oraclelinux-7-pg12/Dockerfile index f55eeb9e..c999fc6d 100644 --- a/dockerfiles/oraclelinux-7-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg13/Dockerfile b/dockerfiles/oraclelinux-7-pg13/Dockerfile index c00dbe3d..e03124d3 100644 --- a/dockerfiles/oraclelinux-7-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg13/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg14/Dockerfile b/dockerfiles/oraclelinux-7-pg14/Dockerfile index 9e3401a0..dab3e975 100644 --- a/dockerfiles/oraclelinux-7-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg15/Dockerfile b/dockerfiles/oraclelinux-7-pg15/Dockerfile index 8ced6d60..2524a92e 100644 --- a/dockerfiles/oraclelinux-7-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-7-pg16/Dockerfile b/dockerfiles/oraclelinux-7-pg16/Dockerfile index 26edfc43..6396da4c 100644 --- a/dockerfiles/oraclelinux-7-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-7-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg11/Dockerfile b/dockerfiles/oraclelinux-8-pg11/Dockerfile index 8f733aff..79741626 100644 --- a/dockerfiles/oraclelinux-8-pg11/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg11/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql11-server postgresql11-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg12/Dockerfile b/dockerfiles/oraclelinux-8-pg12/Dockerfile index 086f6c99..ac92b7b7 100644 --- a/dockerfiles/oraclelinux-8-pg12/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg12/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql12-server postgresql12-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg13/Dockerfile b/dockerfiles/oraclelinux-8-pg13/Dockerfile index 1fd3574a..69d51e64 100644 --- a/dockerfiles/oraclelinux-8-pg13/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg13/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql13-server postgresql13-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg14/Dockerfile b/dockerfiles/oraclelinux-8-pg14/Dockerfile index caf1eb63..6be4ac99 100644 --- a/dockerfiles/oraclelinux-8-pg14/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg14/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql14-server postgresql14-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg15/Dockerfile b/dockerfiles/oraclelinux-8-pg15/Dockerfile index 9538d545..d8212e87 100644 --- a/dockerfiles/oraclelinux-8-pg15/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg15/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql15-server postgresql15-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/dockerfiles/oraclelinux-8-pg16/Dockerfile b/dockerfiles/oraclelinux-8-pg16/Dockerfile index 1168b1cb..69515a34 100644 --- a/dockerfiles/oraclelinux-8-pg16/Dockerfile +++ b/dockerfiles/oraclelinux-8-pg16/Dockerfile @@ -104,8 +104,6 @@ RUN ( yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8 && yum install -y postgresql16-server postgresql16-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ diff --git a/templates/Dockerfile-rpm.tmpl b/templates/Dockerfile-rpm.tmpl index fb59d256..54e00268 100644 --- a/templates/Dockerfile-rpm.tmpl +++ b/templates/Dockerfile-rpm.tmpl @@ -104,8 +104,6 @@ RUN ( yum install -y https://%%rpm_url%% \ && yum install -y postgresql%%pgshort%%-server postgresql%%pgshort%%-devel \ && yum clean all -RUN python3 -m pip install wheel - # install jq to process JSON API responses RUN curl -sL https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \ -o /usr/bin/jq \ From eaf11beb4aab3dbfcd317721ab589d9f7221c3a4 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:50:19 +0100 Subject: [PATCH 21/21] build all, no caching --- .github/workflows/build-package-test.yml | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-package-test.yml b/.github/workflows/build-package-test.yml index d6d9aba4..b42d84e9 100644 --- a/.github/workflows/build-package-test.yml +++ b/.github/workflows/build-package-test.yml @@ -40,40 +40,40 @@ jobs: fail-fast: false matrix: TARGET_PLATFORM: - # - centos-7 - # - oraclelinux-8 + - centos-7 + - oraclelinux-8 - oraclelinux-7 - # - almalinux-8 - # - almalinux-9 + - almalinux-8 + - almalinux-9 POSTGRES_VERSION: - # - pg11 - # - pg12 - # - pg13 - # - pg14 + - pg11 + - pg12 + - pg13 + - pg14 - pg15 - # - pg16 - # exclude: - # - TARGET_PLATFORM: centos-7 - # POSTGRES_VERSION: pg16 - # - TARGET_PLATFORM: oraclelinux-7 - # POSTGRES_VERSION: pg16 - # include: - # - TARGET_PLATFORM: debian-buster - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: debian-bullseye - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: debian-bookworm - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: ubuntu-bionic - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: ubuntu-focal - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: ubuntu-jammy - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: ubuntu-kinetic - # POSTGRES_VERSION: all - # - TARGET_PLATFORM: pgxn - # POSTGRES_VERSION: all + - pg16 + exclude: + - TARGET_PLATFORM: centos-7 + POSTGRES_VERSION: pg16 + - TARGET_PLATFORM: oraclelinux-7 + POSTGRES_VERSION: pg16 + include: + - TARGET_PLATFORM: debian-buster + POSTGRES_VERSION: all + - TARGET_PLATFORM: debian-bullseye + POSTGRES_VERSION: all + - TARGET_PLATFORM: debian-bookworm + POSTGRES_VERSION: all + - TARGET_PLATFORM: ubuntu-bionic + POSTGRES_VERSION: all + - TARGET_PLATFORM: ubuntu-focal + POSTGRES_VERSION: all + - TARGET_PLATFORM: ubuntu-jammy + POSTGRES_VERSION: all + - TARGET_PLATFORM: ubuntu-kinetic + POSTGRES_VERSION: all + - TARGET_PLATFORM: pgxn + POSTGRES_VERSION: all steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -92,8 +92,8 @@ jobs: pull: true push: true tags: ghcr.io/citusdata/packaging-test:${{ matrix.TARGET_PLATFORM }}-${{ matrix.POSTGRES_VERSION }} - cache-from: type=gha - cache-to: type=gha,mode=max + # cache-from: type=gha + # cache-to: type=gha,mode=max # - name: Clone tools repo for test # run: git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools