diff --git a/Dockerfile.citus b/Dockerfile.citus index 06a84683..b0920557 100644 --- a/Dockerfile.citus +++ b/Dockerfile.citus @@ -37,8 +37,10 @@ RUN set -ex \ && MAKEFLAGS="-j $(grep -c ^processor /proc/cpuinfo)" \ && cd citus && ./configure && make install && cd ../ && rm -rf /citus; \ else \ - curl https://install.citusdata.com/community/deb.sh | bash \ - && apt-get -y install postgresql-$PG_MAJOR-citus-11.2; \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/citusdata_community.gpg] https://packagecloud.io/citusdata/community/debian/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/citusdata_community.list \ + && curl -sL https://packagecloud.io/citusdata/community/gpgkey | gpg --dearmor > /etc/apt/trusted.gpg.d/citusdata_community.gpg \ + && apt-get update -y \ + && apt-get -y install postgresql-$PG_MAJOR-citus-11.3 \ fi \ && pip3 install dumb-init \ \ @@ -88,7 +90,7 @@ RUN set -ex \ libmagic1 bsdmainutils login ncurses-bin libmagic-mgc e2fslibs bsdutils \ exim4-config gnupg-agent dirmngr libpython2.7-stdlib libpython2.7-minimal \ postgresql-server-dev-$PG_MAJOR git gcc make autoconf \ - libc6-dev flex libcurl4-gnutls-dev libicu-dev libkrb5-dev liblz4-dev \ + libc6-dev flex libicu-dev libkrb5-dev liblz4-dev \ libpam0g-dev libreadline-dev libselinux1-dev libssl-dev libxslt1-dev libzstd-dev uuid-dev \ && apt-get autoremove -y \ && apt-get clean -y \ diff --git a/kubernetes/Dockerfile.citus b/kubernetes/Dockerfile.citus index de3ecb0b..195bb8e9 100644 --- a/kubernetes/Dockerfile.citus +++ b/kubernetes/Dockerfile.citus @@ -10,8 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \ | xargs apt-get install -y busybox vim-tiny curl jq less locales git python3-pip python3-wheel \ ## Make sure we have a en_US.UTF-8 locale available && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \ - && curl https://install.citusdata.com/community/deb.sh | bash \ - && apt-get -y install postgresql-15-citus-11.2 \ + && echo "deb [signed-by=/etc/apt/trusted.gpg.d/citusdata_community.gpg] https://packagecloud.io/citusdata/community/debian/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/citusdata_community.list \ + && curl -sL https://packagecloud.io/citusdata/community/gpgkey | gpg --dearmor > /etc/apt/trusted.gpg.d/citusdata_community.gpg \ + && apt-get update -y \ + && apt-get -y install postgresql-$PG_MAJOR-citus-11.3 \ && pip3 install setuptools \ && pip3 install 'git+https://github.com/zalando/patroni.git#egg=patroni[kubernetes]' \ && PGHOME=/home/postgres \