From 7fe1820e5d7786fac1e07f5d7d182925f811ccc3 Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Thu, 12 Sep 2024 14:07:59 -0700 Subject: [PATCH] Fix Docker builds for ipfix-collector and kafka-consumer The go version needs to be updated in the Dockerfiles. We also make sure that the Github workflow which validates the Docker builds is run for pull requests. Signed-off-by: Antonin Bas --- .github/workflows/build.yml | 2 -- build/images/Dockerfile.build.collector | 2 +- build/images/Dockerfile.build.consumer | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33a9ecd9..e5d3ba59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,6 @@ on: jobs: build-ipfix-collector: - if: ${{ github.event_name == 'push' }} runs-on: [ubuntu-latest] steps: - uses: actions/checkout@v3 @@ -27,7 +26,6 @@ jobs: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker push antrea/ipfix-collector:latest build-kafka-consumer: - if: ${{ github.event_name == 'push' }} runs-on: [ubuntu-latest] steps: - uses: actions/checkout@v3 diff --git a/build/images/Dockerfile.build.collector b/build/images/Dockerfile.build.collector index 21c6e260..efec3723 100644 --- a/build/images/Dockerfile.build.collector +++ b/build/images/Dockerfile.build.collector @@ -1,4 +1,4 @@ -FROM golang:1.21 as go-ipfix-build +FROM golang:1.23 as go-ipfix-build WORKDIR /go-ipfix diff --git a/build/images/Dockerfile.build.consumer b/build/images/Dockerfile.build.consumer index 37435146..d0d6e67e 100644 --- a/build/images/Dockerfile.build.consumer +++ b/build/images/Dockerfile.build.consumer @@ -1,4 +1,4 @@ -FROM golang:1.21 as go-ipfix-build +FROM golang:1.23 as go-ipfix-build WORKDIR /go-ipfix