Skip to content

Commit 7b9a2d6

Browse files
authored
Merge pull request #6524 from line-o/docker-security
2 parents db35bc4 + bdbc765 commit 7b9a2d6

2 files changed

Lines changed: 20 additions & 1 deletion

File tree

.github/workflows/ci-container.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,16 @@ jobs:
3737
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4
3838
with:
3939
platforms: linux/amd64,linux/arm64
40+
- name: Enable containerd image store
41+
run: |
42+
echo '{ "features": { "containerd-snapshotter": true } }' | sudo tee /etc/docker/daemon.json
43+
sudo systemctl restart docker
44+
- name: Verify containerd snapshotter is active
45+
run: docker info -f '{{.DriverStatus}}'
4046
- name: Make buildkit default
4147
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
48+
with:
49+
driver: docker
4250
id: buildx
4351
- uses: ./.github/actions/maven-cache
4452
- uses: ./.github/actions/maven-github-settings
@@ -60,7 +68,8 @@ jobs:
6068
VERSION="${{ github.ref_name }}"
6169
REVISION_ARG="-Drevision=${VERSION#eXist-}"
6270
fi
63-
mvn -V -B --no-transfer-progress -q \
71+
mvn -V -B --no-transfer-progress \
72+
-Ddocker.sbom=true -Ddocker.provenance=true \
6473
-Pdocker,skip-build-dist-archives \
6574
-DskipTests -Ddependency-check.skip=true \
6675
$REVISION_ARG \

exist-docker/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
<docker.tag>latest</docker.tag>
5454
<docker.debug.tag>debug</docker.debug.tag>
5555
<docker.platforms>linux/amd64, linux/arm64</docker.platforms>
56+
<docker.sbom>false</docker.sbom>
57+
<docker.provenance>false</docker.provenance>
5658
</properties>
5759

5860
<dependencies>
@@ -234,6 +236,10 @@
234236
<platforms>
235237
<platform>${docker.platforms}</platform>
236238
</platforms>
239+
<attestations>
240+
<provenance>${docker.provenance}</provenance>
241+
<sbom>${docker.sbom}</sbom>
242+
</attestations>
237243
</buildx>
238244
<tags>
239245
<tag>${docker.tag}</tag>
@@ -251,6 +257,10 @@
251257
<platforms>
252258
<platform>${docker.platforms}</platform>
253259
</platforms>
260+
<attestations>
261+
<provenance>${docker.provenance}</provenance>
262+
<sbom>${docker.sbom}</sbom>
263+
</attestations>
254264
</buildx>
255265
<tags>
256266
<tag>${docker.debug.tag}</tag>

0 commit comments

Comments
 (0)