Skip to content

Commit 05f146d

Browse files
authored
Push flow-aggregator image to ghcr.io registry (#7036)
As an alternative to docker.io This is the same change that we did previously for the "main" Antrea images (antrea-agent-ubuntu and antrea-controller-ubuntu). Signed-off-by: Antonin Bas <[email protected]>
1 parent 7a8982f commit 05f146d

File tree

2 files changed

+66
-14
lines changed

2 files changed

+66
-14
lines changed

.github/workflows/build.yml

+32-7
Original file line numberDiff line numberDiff line change
@@ -255,23 +255,48 @@ jobs:
255255
build-flow-aggregator:
256256
needs: check-env
257257
if: ${{ needs.check-env.outputs.has_changes == 'yes' || github.event_name == 'push' }}
258-
runs-on: [ubuntu-latest]
258+
runs-on: ubuntu-latest
259+
env:
260+
DOCKER_TAG: latest
259261
steps:
260262
- uses: actions/checkout@v4
261263
with:
262264
show-progress: false
265+
- name: Set up Docker Buildx
266+
uses: docker/setup-buildx-action@v3
267+
with:
268+
driver: ${{ needs.check-env.outputs.docker_driver }}
263269
- name: Build flow-aggregator Docker image
264270
run: make flow-aggregator-image
265271
- name: Check flow-aggregator Docker image
266272
run: docker run antrea/flow-aggregator --version
267-
- name: Push flow-aggregator Docker image to registry
273+
- name: Login to Docker Hub
274+
if: ${{ needs.check-env.outputs.push_needed == 'true' }}
275+
uses: docker/login-action@v3
276+
with:
277+
username: ${{ secrets.DOCKER_USERNAME }}
278+
password: ${{ secrets.DOCKER_PASSWORD }}
279+
- name: Login to Github Container Registry
280+
if: ${{ needs.check-env.outputs.push_needed == 'true' }}
281+
uses: docker/login-action@v3
282+
with:
283+
registry: ghcr.io
284+
username: ${{ github.actor }}
285+
password: ${{ secrets.GITHUB_TOKEN }}
286+
- name: Push flow-aggregator Docker image to registries
268287
if: ${{ needs.check-env.outputs.push_needed == 'true' }}
269-
env:
270-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
271-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
272288
run: |
273-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
274-
docker push antrea/flow-aggregator:latest
289+
targets=(
290+
"docker.io antrea"
291+
"ghcr.io antrea-io"
292+
)
293+
for target in "${targets[@]}"; do
294+
t=($target)
295+
registry="${t[0]}"
296+
namespace="${t[1]}"
297+
docker tag antrea/flow-aggregator:"${DOCKER_TAG}" ${registry}/${namespace}/flow-aggregator:"${DOCKER_TAG}"
298+
docker push ${registry}/${namespace}/flow-aggregator:"${DOCKER_TAG}"
299+
done
275300
276301
build-antrea-migrator:
277302
needs: check-env

.github/workflows/build_tag.yml

+34-7
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ jobs:
146146
show-progress: false
147147
- name: Set up Docker Buildx
148148
uses: docker/setup-buildx-action@v3
149+
with:
150+
driver: docker
149151
- name: Build and push Antrea UBI9 amd64 Docker images to registry
150152
env:
151153
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -194,19 +196,44 @@ jobs:
194196
docker push antrea/antrea-mc-controller:"${VERSION}"
195197
196198
build-flow-aggregator:
197-
runs-on: [ubuntu-latest]
198199
needs: get-version
200+
runs-on: ubuntu-latest
201+
env:
202+
DOCKER_TAG: ${{ needs.get-version.outputs.version }}
199203
steps:
200204
- uses: actions/checkout@v4
201205
with:
202206
ref: ${{ needs.get-version.outputs.antrea_ref }}
203207
show-progress: false
204-
- name: Build flow-aggregator Docker image and push to registry
208+
- name: Set up Docker Buildx
209+
uses: docker/setup-buildx-action@v3
210+
with:
211+
driver: docker
212+
- name: Build flow-aggregator Docker image
205213
env:
206-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
207-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
208214
VERSION: ${{ needs.get-version.outputs.version }}
215+
run: make flow-aggregator-image
216+
- name: Login to Docker Hub
217+
uses: docker/login-action@v3
218+
with:
219+
username: ${{ secrets.DOCKER_USERNAME }}
220+
password: ${{ secrets.DOCKER_PASSWORD }}
221+
- name: Login to Github Container Registry
222+
uses: docker/login-action@v3
223+
with:
224+
registry: ghcr.io
225+
username: ${{ github.actor }}
226+
password: ${{ secrets.GITHUB_TOKEN }}
227+
- name: Push flow-aggregator Docker image to registries
209228
run: |
210-
make flow-aggregator-image
211-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
212-
docker push antrea/flow-aggregator:"${VERSION}"
229+
targets=(
230+
"docker.io antrea"
231+
"ghcr.io antrea-io"
232+
)
233+
for target in "${targets[@]}"; do
234+
t=($target)
235+
registry="${t[0]}"
236+
namespace="${t[1]}"
237+
docker tag antrea/flow-aggregator:"${DOCKER_TAG}" ${registry}/${namespace}/flow-aggregator:"${DOCKER_TAG}"
238+
docker push ${registry}/${namespace}/flow-aggregator:"${DOCKER_TAG}"
239+
done

0 commit comments

Comments
 (0)