Skip to content

Commit 9573c84

Browse files
SchmaetzSchmaetz
committed
Removed ENV and ARG CONTAINERSUITE, replaced by IMAGE_PATH
1 parent 1add939 commit 9573c84

File tree

8 files changed

+24
-25
lines changed

8 files changed

+24
-25
lines changed

‎Makefile‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ BASEOS ?= rocky9
55
CONTAINERIMAGE ?= rockylinux/rockylinux:9-ubi-micro
66
IMAGE_REPOSITORY ?= docker.io
77
IMAGE_PATH ?= cybertec-pg-container
8-
CONTAINERSUITE ?= cybertec-pg-container
98
PGVERSION ?= 17
109
PGVERSION_FULL ?= 17.4
1110
OLD_PG_VERSIONS ?= 13 14 15 16
@@ -49,20 +48,20 @@ base-build:
4948
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
5049
--build-arg BASEOS=$(BASEOS) \
5150
--build-arg PACKAGER=$(PACKAGER) \
52-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE)
51+
--build-arg IMAGE_PATH=$(IMAGE_PATH)
5352

5453
base: base-build;
5554

5655
pgbackrest-build:
5756
docker build $(ROOTPATH) \
5857
--file $(ROOTPATH)/docker/pgbackrest/Dockerfile \
59-
--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG) \
58+
--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG) \
6059
--build-arg BASE_IMAGE=$(BASE_IMAGE) \
6160
--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} \
6261
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
6362
--build-arg BASEOS=$(BASEOS) \
6463
--build-arg PACKAGER=$(PACKAGER) \
65-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
64+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
6665
--build-arg BUILD=$(BUILD) \
6766
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
6867
--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)" \
@@ -80,7 +79,7 @@ postgres-build:
8079
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
8180
--build-arg BASEOS=$(BASEOS) \
8281
--build-arg PACKAGER=$(PACKAGER) \
83-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
82+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
8483
--build-arg BUILD=$(BUILD) \
8584
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
8685
--build-arg PATRONI_VERSION=$(PATRONI_VERSION) \
@@ -101,7 +100,7 @@ postgres-gis-build:
101100
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
102101
--build-arg BASEOS=$(BASEOS) \
103102
--build-arg PACKAGER=$(PACKAGER) \
104-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
103+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
105104
--build-arg BUILD=$(BUILD) \
106105
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
107106
--build-arg PATRONI_VERSION=$(PATRONI_VERSION) \
@@ -122,7 +121,7 @@ postgres-oracle-build:
122121
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
123122
--build-arg BASEOS=$(BASEOS) \
124123
--build-arg PACKAGER=$(PACKAGER) \
125-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
124+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
126125
--build-arg BUILD=$(BUILD) \
127126
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
128127
--build-arg PATRONI_VERSION=$(PATRONI_VERSION) \
@@ -142,7 +141,7 @@ pgbouncer-build:
142141
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
143142
--build-arg BASEOS=$(BASEOS) \
144143
--build-arg PACKAGER=$(PACKAGER) \
145-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
144+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
146145
--build-arg BUILD=$(BUILD) \
147146
--build-arg PGBOUNCER_VERSION=${PGBOUNCER_VERSION} \
148147
--build-arg PGVERSION=$(PGVERSION)
@@ -158,7 +157,7 @@ exporter-build:
158157
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
159158
--build-arg BASEOS=$(BASEOS) \
160159
--build-arg PACKAGER=$(PACKAGER) \
161-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
160+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
162161
--build-arg BUILD=$(BUILD) \
163162
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
164163
--build-arg PGVERSION=$(PGVERSION)
@@ -174,7 +173,7 @@ publicbeta-pg-build:
174173
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
175174
--build-arg BASEOS=$(BASEOS) \
176175
--build-arg PACKAGER=$(PACKAGER) \
177-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
176+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
178177
--build-arg BUILD=$(BUILD) \
179178
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
180179
--build-arg PATRONI_VERSION=$(PATRONI_VERSION) \
@@ -194,7 +193,7 @@ publicbeta-pgbackrest-build:
194193
--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY) \
195194
--build-arg BASEOS=$(BASEOS) \
196195
--build-arg PACKAGER=$(PACKAGER) \
197-
--build-arg CONTAINERSUITE=$(CONTAINERSUITE) \
196+
--build-arg IMAGE_PATH=$(IMAGE_PATH) \
198197
--build-arg BUILD=$(BUILD) \
199198
--build-arg PGBACKREST_VERSION=$(PGBACKREST_VERSION) \
200199
--build-arg OLD_PG_VERSIONS="$(OLD_PG_VERSIONS)" \

‎docker/exporter/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG CONTAINERIMAGE
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} AS builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} AS builder
77

88
ARG PACKAGER
99

‎docker/pg-public-beta/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG PGVERSION
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} as builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} as builder
77

88
# Dockerfile specific informations
99
ARG PACKAGER

‎docker/pgbackrest-public-beta/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG CONTAINERIMAGE
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} AS builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} AS builder
77

88
# Dockerfile specific informations
99
ARG PACKAGER

‎docker/pgbackrest/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG CONTAINERIMAGE
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} AS builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} AS builder
77

88
# Dockerfile specific informations
99
ARG PACKAGER

‎docker/pgbouncer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG CONTAINERIMAGE
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} AS builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} AS builder
77

88
ARG PACKAGER
99
ARG PGBOUNCER_VERSION

‎docker/postgres-gis/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG PGVERSION
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} as builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} as builder
77

88
# Dockerfile specific informations
99
ARG PACKAGER

‎docker/postgres/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
ARG CONTAINERSUITE
1+
ARG IMAGE_PATH
22
ARG BUILD
33
ARG BASEOS
44
ARG PGVERSION
55

6-
FROM ${CONTAINERSUITE}/base:${BASEOS}-${BUILD} as builder
6+
FROM ${IMAGE_PATH}/base:${BASEOS}-${BUILD} as builder
77

88
# Dockerfile specific informations
99
ARG PACKAGER

0 commit comments

Comments
 (0)