@@ -142,13 +142,11 @@ RUN apt-get update \
142142 postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
143143 && rm -rf /var/lib/apt/lists/*
144144
145- # Install Zombodb extension
145+ # Install zombodb extension
146146RUN apt-get update -y -qq --fix-missing \
147147 && apt-get install -y wget gnupg \
148- && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main 15" >> /etc/apt/sources.list.d/pgdg.list \
149148 && echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list \
150149 && echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list \
151- && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
152150 && wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
153151 && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
154152 && apt update \
@@ -168,16 +166,14 @@ RUN apt-get update -y -qq --fix-missing \
168166 && ./configure --with-openssl-dir=/usr/include/openssl-1.0 \
169167 && make -j64 \
170168 && make install \
171- && gem install --no-document fpm
172-
173- RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
169+ && gem install --no-document fpm \
170+ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
174171 && export PATH="/.cargo/bin:$PATH" \
175172 && export PGRX_HOME="/.pgrx/" \
176173 && mkdir -p $PGRX_HOME \
177174 && cargo install cargo-pgrx --version 0.8.3 \
178- && cargo pgrx init --pg15=/opt/bitnami/postgresql/bin/pg_config
179-
180- RUN git clone https://github.com/zombodb/zombodb.git \
175+ && cargo pgrx init --pg${PG_MAJOR}=/opt/bitnami/postgresql/bin/pg_config \
176+ && git clone https://github.com/zombodb/zombodb.git \
181177 && cd zombodb \
182178 && export PATH="/.cargo/bin:$PATH" && cargo pgrx install --release
183179
0 commit comments