Skip to content

Commit 79e8b25

Browse files
authored
Merge branch 'main' into add_hll
2 parents 55b2d1c + 9ff4bde commit 79e8b25

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ RUN apk add --no-cache --virtual .zombodb-build-deps \
249249
&& gem install --no-document fpm \
250250
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \
251251
&& PATH=$HOME/.cargo/bin:$PATH \
252-
&& cargo install cargo-pgrx --version 0.8.3 \
252+
&& cargo install cargo-pgrx --version 0.9.3 \
253253
&& cargo pgrx init --${PG_VER}=$(which pg_config) \
254254
&& git clone https://github.com/zombodb/zombodb.git \
255255
&& cd ./zombodb \
@@ -314,6 +314,7 @@ RUN set -eux \
314314
&& rm -rf /tmp/pg_auto_failove-${PG_AUTO_FAILOVER_VERSION} /tmp/pg_auto_failove-${PG_AUTO_FAILOVER_VERSION}.zip \
315315
&& apk del .pg_auto_failover-build-deps
316316

317+
317318
## Adding postgresql-hll
318319
ARG POSTGRES_HLL_VERSION
319320
RUN set -eux \
@@ -338,4 +339,5 @@ RUN set -eux \
338339
# clean
339340
&& cd / \
340341
&& rm -rf /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip \
341-
&& apk del .postgresql-hll-build-deps
342+
&& apk del .postgresql-hll-build-deps
343+

bitnami/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ RUN apt-get update -y -qq --fix-missing \
267267
&& export PATH="/.cargo/bin:$PATH" \
268268
&& export PGRX_HOME="/.pgrx/" \
269269
&& mkdir -p $PGRX_HOME \
270-
&& cargo install cargo-pgrx --version 0.8.3 \
270+
&& cargo install cargo-pgrx --version 0.9.3 \
271271
&& cargo pgrx init --pg${PG_MAJOR}=/opt/bitnami/postgresql/bin/pg_config \
272272
&& git clone https://github.com/zombodb/zombodb.git \
273273
&& cd zombodb \

0 commit comments

Comments
 (0)