Skip to content

Commit b04e4ad

Browse files
teoincontattoteoincontatto
committed
fix: removed old image dependency in order to solve CVE-2023-37920 
1 parent 1c0cf5c commit b04e4ad

10 files changed

Lines changed: 50 additions & 100 deletions

File tree

‎stackgres-k8s/src/cluster-controller/src/main/docker/Dockerfile.jvm‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -38,10 +34,9 @@ FROM "$BASE_IMAGE"
3834
USER root:root
3935

4036
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
41-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4237
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4338
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
44-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
39+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4540
echo 'jboss:x:1000:' >> /etc/group && \
4641
echo 'jboss:!::' >> /etc/gshadow && \
4742
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/cluster-controller/src/main/docker/Dockerfile.native‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -36,10 +32,9 @@ FROM "$BASE_IMAGE"
3632
USER root:root
3733

3834
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
39-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4035
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4136
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
42-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
37+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4338
echo 'jboss:x:1000:' >> /etc/group && \
4439
echo 'jboss:!::' >> /etc/gshadow && \
4540
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/jobs/src/main/docker/Dockerfile.jvm‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -38,10 +34,9 @@ FROM "$BASE_IMAGE"
3834
USER root:root
3935

4036
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
41-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4237
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4338
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
44-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
39+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4540
echo 'jboss:x:1000:' >> /etc/group && \
4641
echo 'jboss:!::' >> /etc/gshadow && \
4742
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/jobs/src/main/docker/Dockerfile.native‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -36,10 +32,9 @@ FROM "$BASE_IMAGE"
3632
USER root:root
3733

3834
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
39-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4035
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4136
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
42-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
37+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4338
echo 'jboss:x:1000:' >> /etc/group && \
4439
echo 'jboss:!::' >> /etc/gshadow && \
4540
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/operator/src/main/docker/Dockerfile.jvm‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -38,10 +34,9 @@ FROM "$BASE_IMAGE"
3834
USER root:root
3935

4036
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
41-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4237
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4338
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
44-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
39+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4540
echo 'jboss:x:1000:' >> /etc/group && \
4641
echo 'jboss:!::' >> /etc/gshadow && \
4742
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/operator/src/main/docker/Dockerfile.native‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -36,10 +32,9 @@ FROM "$BASE_IMAGE"
3632
USER root:root
3733

3834
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
39-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4035
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4136
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
42-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
37+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4338
echo 'jboss:x:1000:' >> /etc/group && \
4439
echo 'jboss:!::' >> /etc/gshadow && \
4540
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/restapi/src/main/docker/Dockerfile.jvm‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -38,10 +34,9 @@ FROM "$BASE_IMAGE"
3834
USER root:root
3935

4036
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
41-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4237
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4338
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
44-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
39+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4540
echo 'jboss:x:1000:' >> /etc/group && \
4641
echo 'jboss:!::' >> /etc/gshadow && \
4742
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

‎stackgres-k8s/src/restapi/src/main/docker/Dockerfile.native‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ ARG BASE_IMAGE
22

33
FROM quay.io/ongres/patroni:v3.2.2-pg16.2-build-6.30 AS patroni_3_2_2
44
FROM quay.io/ongres/patroni:v3.3.3-pg16.4-build-6.37 AS patroni_3_3_3
5-
FROM quay.io/ongres/patroni:v4.0.6-pg17.5-build-6.42 AS patroni_4_0_6
5+
FROM quay.io/ongres/patroni:v4.1.0-pg18.0-build-6.44 AS patroni_4_1_0
66

77
FROM scratch AS copy
8-
COPY --from=patroni_3_0_2 /usr/bin/patronictl /usr/bin/patronictl-3.0.2
9-
COPY --from=patroni_3_0_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.0.2
10-
COPY --from=patroni_3_0_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.0.2
11-
128
COPY --from=patroni_3_2_2 /usr/bin/patronictl /usr/bin/patronictl-3.2.2
139
COPY --from=patroni_3_2_2 /usr/lib64/python3.9/site-packages /usr/lib/patroni-3.2.2
1410
COPY --from=patroni_3_2_2 /usr/lib/python3.9/site-packages /usr/lib/patroni-3.2.2
@@ -17,9 +13,9 @@ FROM scratch AS copy
1713
COPY --from=patroni_3_3_3 /usr/lib64/python3.11/site-packages /usr/lib/patroni-3.3.3
1814
COPY --from=patroni_3_3_3 /usr/lib/python3.11/site-packages /usr/lib/patroni-3.3.3
1915

20-
COPY --from=patroni_4_0_6 /usr/bin/patronictl /usr/bin/patronictl-4.0.6
21-
COPY --from=patroni_4_0_6 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.0.6
22-
COPY --from=patroni_4_0_6 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.0.6
16+
COPY --from=patroni_4_1_0 /usr/bin/patronictl /usr/bin/patronictl-4.1.0
17+
COPY --from=patroni_4_1_0 /usr/lib64/python3.12/site-packages /usr/lib/patroni-4.1.0
18+
COPY --from=patroni_4_1_0 /usr/lib/python3.12/site-packages /usr/lib/patroni-4.1.0
2319

2420
COPY 'src/main/docker/LICENCE' '/licenses/stackgres'
2521

@@ -36,10 +32,9 @@ FROM "$BASE_IMAGE"
3632
USER root:root
3733

3834
RUN microdnf install -y python3.9 python3.11 python3.12 libpq && \
39-
sed -i "5i sys.path.append('/usr/lib/patroni-3.0.2')" /usr/bin/patronictl-3.0.2 && \
4035
sed -i "5i sys.path.append('/usr/lib/patroni-3.2.2')" /usr/bin/patronictl-3.2.2 && \
4136
sed -i "5i sys.path.append('/usr/lib/patroni-3.3.3')" /usr/bin/patronictl-3.3.3 && \
42-
sed -i "5i sys.path.append('/usr/lib/patroni-4.0.6')" /usr/bin/patronictl-4.0.6 && \
37+
sed -i "5i sys.path.append('/usr/lib/patroni-4.1.0')" /usr/bin/patronictl-4.1.0 && \
4338
echo 'jboss:x:1000:' >> /etc/group && \
4439
echo 'jboss:!::' >> /etc/gshadow && \
4540
echo 'jboss:x:1000:1000::/app:/bin/bash' >> /etc/passwd && \

0 commit comments

Comments
 (0)