Skip to content

Commit 7f01fd3

Browse files
fredjVampouille
authored andcommitted
feat: build version 15 and 16, use debian bookworm for versions 11 to 16
1 parent 5da7f9e commit 7f01fd3

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG BASE_TAG
2-
FROM postgres:${BASE_TAG}-bullseye AS builder
2+
ARG DEBIAN_RELEASE
3+
FROM postgres:${BASE_TAG}-${DEBIAN_RELEASE} AS builder
34

45
RUN apt-get update && \
56
apt-get install -y unzip build-essential git wget libbrotli-dev
@@ -33,7 +34,8 @@ RUN ./main/pg/wal-g --version && \
3334
cp ./main/pg/wal-g /wal-g-v2.0.1
3435

3536
ARG BASE_TAG
36-
FROM postgres:${BASE_TAG}-bullseye
37+
ARG DEBIAN_RELEASE
38+
FROM postgres:${BASE_TAG}-${DEBIAN_RELEASE}
3739

3840
ARG POSTGIS_VERSIONS
3941
ENV DEBIAN_FRONTEND=noninteractive \

Makefile

+14-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ PGHOST := $(shell ip -json addr|jq -r '.[] | select(.ifname | test("^docker0$$")
55
define build-image
66
@echo Base tag $1
77
@echo Postgis versions $2
8-
docker build --pull --no-cache --build-arg BASE_TAG=${1} --build-arg POSTGIS_VERSIONS=${2} -t camptocamp/postgres:${1}-postgis-$(subst $(space),-,${2}) .
8+
@echo Debian release $3
9+
docker build --pull --no-cache --build-arg BASE_TAG=${1} --build-arg POSTGIS_VERSIONS=${2} --build-arg DEBIAN_RELEASE=${3} -t camptocamp/postgres:${1}-postgis-$(subst $(space),-,${2}) .
910
docker stop db || true
1011
docker run --rm --name=db --detach --publish=5432:5432 --env=POSTGRES_USER=www-data --env=POSTGRES_PASSWORD=www-data --env=POSTGRES_DB=test camptocamp/postgres:${1}-postgis-$(subst $(space),-,${2})
1112
sleep 10
@@ -19,19 +20,25 @@ define build-image
1920
docker system prune --all -f
2021
endef
2122

22-
all: 10 11 12 13 14
23+
all: 10 11 12 13 14 15 16
2324

2425
10:
25-
$(call build-image,"10","3")
26+
$(call build-image,"10","3","bullseye")
2627

2728
11:
28-
$(call build-image,"11","3")
29+
$(call build-image,"11","3","bookworm")
2930

3031
12:
31-
$(call build-image,"12","3")
32+
$(call build-image,"12","3","bookworm")
3233

3334
13:
34-
$(call build-image,"13","3")
35+
$(call build-image,"13","3","bookworm")
3536

3637
14:
37-
$(call build-image,"14","3")
38+
$(call build-image,"14","3","bookworm")
39+
40+
15:
41+
$(call build-image,"15","3","bookworm")
42+
43+
16:
44+
$(call build-image,"16","3","bookworm")

0 commit comments

Comments
 (0)