Skip to content

Commit 074e350

Browse files
committed
Merge branch 'feature/PB-46189' into 'master'
feature/PB 46189 bump supercronic to fix sec vulns. See merge request passbolt/passbolt_docker!238
2 parents 454eba4 + 5e79d11 commit 074e350

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.gitlab-ci/Jobs/build_image.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ build-ce-stable-docker:
6666
DOCKERFILE_PATH: "debian/Dockerfile"
6767
DOCKER_TAG: "root"
6868
SUPERCRONIC_ARCH: amd64
69-
SUPERCRONIC_SHA1SUM: e8631edc1775000d119b70fd40339a7238eece14
69+
SUPERCRONIC_SHA1SUM: bc072eba2ae083849d5f86c6bd1f345f6ed902d0
7070
PLATFORM: "linux/amd64"
7171

7272
build-ce-stable-rootless:
@@ -75,7 +75,7 @@ build-ce-stable-rootless:
7575
DOCKERFILE_PATH: "debian/Dockerfile.rootless"
7676
DOCKER_TAG: "rootless"
7777
SUPERCRONIC_ARCH: amd64
78-
SUPERCRONIC_SHA1SUM: e8631edc1775000d119b70fd40339a7238eece14
78+
SUPERCRONIC_SHA1SUM: bc072eba2ae083849d5f86c6bd1f345f6ed902d0
7979
PLATFORM: "linux/amd64"
8080

8181
build-pro-stable-docker:
@@ -84,7 +84,7 @@ build-pro-stable-docker:
8484
DOCKERFILE_PATH: "debian/Dockerfile"
8585
DOCKER_TAG: "root"
8686
SUPERCRONIC_ARCH: amd64
87-
SUPERCRONIC_SHA1SUM: e8631edc1775000d119b70fd40339a7238eece14
87+
SUPERCRONIC_SHA1SUM: bc072eba2ae083849d5f86c6bd1f345f6ed902d0
8888
PLATFORM: "linux/amd64"
8989

9090
build-pro-stable-rootless:
@@ -93,7 +93,7 @@ build-pro-stable-rootless:
9393
DOCKERFILE_PATH: "debian/Dockerfile.rootless"
9494
DOCKER_TAG: "rootless"
9595
SUPERCRONIC_ARCH: amd64
96-
SUPERCRONIC_SHA1SUM: e8631edc1775000d119b70fd40339a7238eece14
96+
SUPERCRONIC_SHA1SUM: bc072eba2ae083849d5f86c6bd1f345f6ed902d0
9797
PLATFORM: "linux/amd64"
9898

9999
build-ce-stable-docker-arm64-v8:
@@ -105,7 +105,7 @@ build-ce-stable-docker-arm64-v8:
105105
DOCKER_TAG: "root-arm64-v8"
106106
PLATFORM: "linux/arm64/v8"
107107
SUPERCRONIC_ARCH: arm64
108-
SUPERCRONIC_SHA1SUM: 4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e
108+
SUPERCRONIC_SHA1SUM: 37842646e4c95b193c469afae400966565c383d3
109109

110110
build-ce-stable-rootless-arm64-v8:
111111
tags:
@@ -116,7 +116,7 @@ build-ce-stable-rootless-arm64-v8:
116116
DOCKER_TAG: "rootless-arm64-v8"
117117
PLATFORM: "linux/arm64/v8"
118118
SUPERCRONIC_ARCH: arm64
119-
SUPERCRONIC_SHA1SUM: 4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e
119+
SUPERCRONIC_SHA1SUM: 37842646e4c95b193c469afae400966565c383d3
120120

121121
build-pro-stable-docker-arm64-v8:
122122
tags:
@@ -127,7 +127,7 @@ build-pro-stable-docker-arm64-v8:
127127
DOCKER_TAG: "root-arm64-v8"
128128
PLATFORM: "linux/arm64/v8"
129129
SUPERCRONIC_ARCH: arm64
130-
SUPERCRONIC_SHA1SUM: 4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e
130+
SUPERCRONIC_SHA1SUM: 37842646e4c95b193c469afae400966565c383d3
131131

132132
build-pro-stable-rootless-arm64-v8:
133133
tags:
@@ -138,7 +138,7 @@ build-pro-stable-rootless-arm64-v8:
138138
DOCKER_TAG: "rootless-arm64-v8"
139139
PLATFORM: "linux/arm64/v8"
140140
SUPERCRONIC_ARCH: arm64
141-
SUPERCRONIC_SHA1SUM: 4ab6343b52bf9da592e8b4bb7ae6eb5a8e21b71e
141+
SUPERCRONIC_SHA1SUM: 37842646e4c95b193c469afae400966565c383d3
142142

143143
build-ce-stable-docker-arm-v5:
144144
tags:
@@ -149,7 +149,7 @@ build-ce-stable-docker-arm-v5:
149149
DOCKER_TAG: "root-arm-v5"
150150
PLATFORM: "linux/arm/v5"
151151
SUPERCRONIC_ARCH: arm
152-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
152+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
153153

154154
build-ce-stable-rootless-arm-v5:
155155
tags:
@@ -160,7 +160,7 @@ build-ce-stable-rootless-arm-v5:
160160
DOCKER_TAG: "rootless-arm-v5"
161161
PLATFORM: "linux/arm/v5"
162162
SUPERCRONIC_ARCH: arm
163-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
163+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
164164

165165
build-pro-stable-docker-arm-v5:
166166
tags:
@@ -171,7 +171,7 @@ build-pro-stable-docker-arm-v5:
171171
DOCKER_TAG: "root-arm-v5"
172172
PLATFORM: "linux/arm/v5"
173173
SUPERCRONIC_ARCH: arm
174-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
174+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
175175

176176
build-pro-stable-rootless-arm-v5:
177177
tags:
@@ -182,7 +182,7 @@ build-pro-stable-rootless-arm-v5:
182182
DOCKER_TAG: "rootless-arm-v5"
183183
PLATFORM: "linux/arm/v5"
184184
SUPERCRONIC_ARCH: arm
185-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
185+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
186186

187187
build-ce-stable-docker-arm-v7:
188188
tags:
@@ -193,7 +193,7 @@ build-ce-stable-docker-arm-v7:
193193
DOCKER_TAG: "root-arm-v7"
194194
PLATFORM: "linux/arm/v7"
195195
SUPERCRONIC_ARCH: arm
196-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
196+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
197197

198198
build-ce-stable-rootless-arm-v7:
199199
tags:
@@ -204,7 +204,7 @@ build-ce-stable-rootless-arm-v7:
204204
DOCKER_TAG: "rootless-arm-v7"
205205
PLATFORM: "linux/arm/v7"
206206
SUPERCRONIC_ARCH: arm
207-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
207+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
208208

209209
build-pro-stable-docker-arm-v7:
210210
tags:
@@ -215,7 +215,7 @@ build-pro-stable-docker-arm-v7:
215215
DOCKER_TAG: "root-arm-v7"
216216
PLATFORM: "linux/arm/v7"
217217
SUPERCRONIC_ARCH: arm
218-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
218+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383
219219

220220
build-pro-stable-rootless-arm-v7:
221221
tags:
@@ -226,4 +226,4 @@ build-pro-stable-rootless-arm-v7:
226226
DOCKER_TAG: "rootless-arm-v7"
227227
PLATFORM: "linux/arm/v7"
228228
SUPERCRONIC_ARCH: arm
229-
SUPERCRONIC_SHA1SUM: 4ba4cd0da62082056b6def085fa9377d965fbe01
229+
SUPERCRONIC_SHA1SUM: 510b84b031b78ebe25b1f00c91ced3434edcd383

debian/Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title=passbolt/passbolt
1414
LABEL org.opencontainers.image.url=https://passbolt.com
1515

1616
ARG SUPERCRONIC_ARCH=amd64
17-
ARG SUPERCRONIC_SHA1SUM=e8631edc1775000d119b70fd40339a7238eece14
17+
ARG SUPERCRONIC_SHA1SUM=bc072eba2ae083849d5f86c6bd1f345f6ed902d0
1818

1919
ARG PASSBOLT_DISTRO="buster"
2020
ARG PASSBOLT_COMPONENT="stable"
@@ -31,7 +31,7 @@ ARG PASSBOLT_GROUP_GID=33
3131
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
3232
ENV PHP_VERSION=8.4
3333
ENV GNUPGHOME=/var/lib/passbolt/.gnupg
34-
ENV SUPERCRONIC_VERSION=0.2.34
34+
ENV SUPERCRONIC_VERSION=0.2.38
3535
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${SUPERCRONIC_ARCH} \
3636
SUPERCRONIC=supercronic-linux-${SUPERCRONIC_ARCH}
3737
ENV PASSBOLT_FLAVOUR="${PASSBOLT_FLAVOUR}"

0 commit comments

Comments
 (0)