Merge pull request #16 from jayanth-kumar-morem/main

Author: ChakshuGautam

Dockerfile

@@ -105,7 +105,7 @@ RUN apk add --no-cache --virtual .citus-deps \
     jq
 
 # Install Citus
-ARG CITUS_VERSION="11.2.0"
+ARG CITUS_VERSION
 RUN set -ex \
     && apk add --no-cache --virtual .citus-build-deps \
         gcc \

Makefile

@@ -3,6 +3,7 @@ NAME=postgres
 # Set ORG to timescale in the caller
 ORG=samagragovernance
 PG_VER=pg15
+CITUS_VERSION="11.2.0"
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 TS_VERSION=main
 PREV_TS_VERSION=$(shell wget --quiet -O - https://raw.githubusercontent.com/timescale/timescaledb/${TS_VERSION}/version.config | grep update_from_version | sed -e 's!update_from_version = !!')
@@ -54,7 +55,7 @@ default: image
 	touch .build_$(TS_VERSION)_$(PG_VER)_oss
 
 .build_$(TS_VERSION)_$(PG_VER): Dockerfile
-	docker build --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) $(TAG) .
+	docker build --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) $(TAG) .
 	touch .build_$(TS_VERSION)_$(PG_VER)
 
 image: .build_$(TS_VERSION)_$(PG_VER)

bitnami/Dockerfile

@@ -51,7 +51,7 @@ RUN set +o pipefail \
 ARG PG_VERSION
 FROM bitnami/postgresql:${PG_VERSION}
 ARG PG_VERSION
-ARG CITUS_VERSION="11.2.0"
+ARG CITUS_VERSION
 
 LABEL maintainer="Timescale https://www.timescale.com"
 

bitnami/Makefile

@@ -2,7 +2,8 @@ NAME=timescaledb
 # Default is to timescaledev to avoid unexpected push to the main repo
 # Set ORG to timescale in the caller
 ORG=timescaledev
-PG_VER=pg12
+PG_VER=pg15
+CITUS_VERSION="11.2.0"
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 
 TS_VERSION=main
@@ -21,7 +22,7 @@ default: image
 .build_$(TS_VERSION)_$(PG_VER): Dockerfile
 	test -n "$(TS_VERSION)"  # TS_VERSION
 	test -n "$(PREV_TS_VERSION)"  # PREV_TS_VERSION
-	docker build -f ./Dockerfile --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) $(TAG) ..
+	docker build -f ./Dockerfile --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) $(TAG) ..
 	touch .build_$(TS_VERSION)_$(PG_VER)-bitnami
 
 image: .build_$(TS_VERSION)_$(PG_VER)