diff --git a/dockerfiles/debian-bookworm-all/Dockerfile b/dockerfiles/debian-bookworm-all/Dockerfile index abc914be..4593f999 100644 --- a/dockerfiles/debian-bookworm-all/Dockerfile +++ b/dockerfiles/debian-bookworm-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/debian-bullseye-all/Dockerfile b/dockerfiles/debian-bullseye-all/Dockerfile index 28514b85..f60f72b4 100644 --- a/dockerfiles/debian-bullseye-all/Dockerfile +++ b/dockerfiles/debian-bullseye-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/debian-buster-all/Dockerfile b/dockerfiles/debian-buster-all/Dockerfile index 4559d696..8b032789 100644 --- a/dockerfiles/debian-buster-all/Dockerfile +++ b/dockerfiles/debian-buster-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* # patch pg_buildext to use multiple processors diff --git a/dockerfiles/debian-stretch-all/Dockerfile b/dockerfiles/debian-stretch-all/Dockerfile index ef98c68f..34f79609 100644 --- a/dockerfiles/debian-stretch-all/Dockerfile +++ b/dockerfiles/debian-stretch-all/Dockerfile @@ -98,8 +98,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl -s https://packagecloud.io/install/repositories/citusdata/community/script.deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl -s https://packagecloud.io/install/repositories/citusdata/community/script.deb.sh | bash \ && rm -rf /var/lib/apt/lists/* # patch pg_buildext to use multiple processors diff --git a/dockerfiles/debian-trixie-all/Dockerfile b/dockerfiles/debian-trixie-all/Dockerfile index e7f3ae9b..e6fc4a0a 100644 --- a/dockerfiles/debian-trixie-all/Dockerfile +++ b/dockerfiles/debian-trixie-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/ubuntu-bionic-all/Dockerfile b/dockerfiles/ubuntu-bionic-all/Dockerfile index 8696fd60..b583557a 100644 --- a/dockerfiles/ubuntu-bionic-all/Dockerfile +++ b/dockerfiles/ubuntu-bionic-all/Dockerfile @@ -101,8 +101,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* # patch pg_buildext to use multiple processors diff --git a/dockerfiles/ubuntu-focal-all/Dockerfile b/dockerfiles/ubuntu-focal-all/Dockerfile index aafc9c99..712dddd9 100644 --- a/dockerfiles/ubuntu-focal-all/Dockerfile +++ b/dockerfiles/ubuntu-focal-all/Dockerfile @@ -101,8 +101,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* # patch pg_buildext to use multiple processors diff --git a/dockerfiles/ubuntu-jammy-all/Dockerfile b/dockerfiles/ubuntu-jammy-all/Dockerfile index 26a5fe33..d4056309 100644 --- a/dockerfiles/ubuntu-jammy-all/Dockerfile +++ b/dockerfiles/ubuntu-jammy-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/ubuntu-noble-all/Dockerfile b/dockerfiles/ubuntu-noble-all/Dockerfile index f621120d..abbe95b5 100644 --- a/dockerfiles/ubuntu-noble-all/Dockerfile +++ b/dockerfiles/ubuntu-noble-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/dockerfiles/ubuntu-resolute-all/Dockerfile b/dockerfiles/ubuntu-resolute-all/Dockerfile index 0547a2f6..ce6b8e56 100644 --- a/dockerfiles/ubuntu-resolute-all/Dockerfile +++ b/dockerfiles/ubuntu-resolute-all/Dockerfile @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/* diff --git a/templates/Dockerfile-deb.tmpl b/templates/Dockerfile-deb.tmpl index ec309b0e..b016b30e 100644 --- a/templates/Dockerfile-deb.tmpl +++ b/templates/Dockerfile-deb.tmpl @@ -100,8 +100,9 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends jq \ && rm -rf /var/lib/apt/lists/* -# install packagecloud repos for pg_auto_failover -RUN curl https://install.citusdata.com/community/deb.sh | bash \ +# install packagecloud repos for pg_auto_failover (amd64 only: the community +# repo has no non-x86_64 packages and its installer aborts on other arches) +RUN [ "$(dpkg --print-architecture)" != "amd64" ] || curl https://install.citusdata.com/community/deb.sh | bash \ && rm -rf /var/lib/apt/lists/*