Skip to content

Commit c6d4e03

Browse files
committed
docker: use Github registry
1 parent 10d242b commit c6d4e03

2 files changed

Lines changed: 38 additions & 20 deletions

File tree

.github/workflows/docker.yml

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Copyright (C) 2024 ANSSI
1+
# Copyright (C) 2026 A. Iooss
22
# SPDX-License-Identifier: CC0-1.0
3-
name: Publish Docker image
3+
name: Create and publish a Docker image
44

55
on:
66
push:
@@ -10,42 +10,54 @@ on:
1010
tags:
1111
- '*'
1212

13+
env:
14+
REGISTRY: ghcr.io
15+
1316
jobs:
14-
push_to_registry:
17+
build-and-push-image:
1518
runs-on: ubuntu-latest
19+
20+
permissions:
21+
contents: read
22+
packages: write
23+
attestations: write
24+
id-token: write
25+
1626
strategy:
1727
matrix:
1828
include:
1929
- context: ./webapp
20-
image: anssi/shovel-webapp
30+
image: ${{ github.repository }}/webapp
2131
platforms: linux/amd64,linux/arm64
2232
- context: ./suricata
23-
image: anssi/shovel-suricata
33+
image: ${{ github.repository }}/suricata
2434
platforms: linux/amd64,linux/arm64
2535
- context: ./grafana
26-
image: anssi/shovel-grafana
36+
image: ${{ github.repository }}/grafana
2737
platforms: linux/amd64,linux/arm64
2838
steps:
29-
- uses: actions/checkout@v4
30-
- uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3
39+
- uses: actions/checkout@v6
40+
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130
3141
with:
32-
platforms: "arm,arm64,s390x,ppc64le"
33-
- uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb
34-
- uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
42+
platforms: "arm,arm64"
43+
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
44+
- uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
3545
with:
36-
username: ${{ secrets.DOCKER_USERNAME }}
37-
password: ${{ secrets.DOCKER_PASSWORD }}
46+
registry: ${{ env.REGISTRY }}
47+
username: ${{ github.actor }}
48+
password: ${{ secrets.GITHUB_TOKEN }}
3849
- name: Extract metadata (tags, labels) for Docker
3950
id: meta
40-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
51+
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
4152
with:
42-
images: ${{ matrix.image }}
53+
images: ${{ env.REGISTRY }}/${{ matrix.image }}
4354
tags: |
4455
type=ref,event=branch
4556
type=ref,event=tag
46-
type=raw,value=latest,enable={{is_default_branch}}
57+
type=raw,value=latest,enable={{ is_default_branch }}
4758
- name: Build and push Docker image
48-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
59+
id: push
60+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
4961
with:
5062
context: ${{ matrix.context }}
5163
platforms: ${{ matrix.platforms }}
@@ -54,3 +66,9 @@ jobs:
5466
labels: ${{ steps.meta.outputs.labels }}
5567
cache-from: type=gha
5668
cache-to: type=gha,mode=max
69+
- name: Generate artifact attestation
70+
uses: actions/attest-build-provenance@v3
71+
with:
72+
subject-name: ${{ env.REGISTRY }}/${{ matrix.image }}
73+
subject-digest: ${{ steps.push.outputs.digest }}
74+
push-to-registry: true

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
services:
44
suricata:
55
build: ./suricata
6-
image: anssi/shovel-suricata:dev
6+
image: ghcr.io/FCSC-FR/shovel/suricata:dev
77
volumes:
88
- "./input_pcaps:/input_pcaps:ro"
99
- "./suricata/rules:/suricata/rules:ro"
@@ -34,7 +34,7 @@ services:
3434

3535
webapp:
3636
build: ./webapp
37-
image: anssi/shovel-webapp:dev
37+
image: ghcr.io/FCSC-FR/shovel/webapp:dev
3838
restart: always
3939
volumes:
4040
# Write access is required in SQLite `mode=ro` as readers need to record
@@ -50,7 +50,7 @@ services:
5050
# Grafana default credentials are admin:admin
5151
grafana:
5252
build: ./grafana
53-
image: anssi/shovel-grafana:dev
53+
image: ghcr.io/FCSC-FR/shovel/grafana:dev
5454
restart: always
5555
volumes:
5656
- "./suricata/output:/suricata/output:rw"

0 commit comments

Comments
 (0)