From 86975ba4093e6f3ecbd66d3939f85332547868d1 Mon Sep 17 00:00:00 2001 From: fruffy Date: Fri, 17 Apr 2026 20:44:15 -0400 Subject: [PATCH 1/2] Update the docker image to Ubuntu 24. --- .github/workflows/build.yml | 6 +++--- Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f2b6cae..87d979e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,9 +26,9 @@ jobs: run: | TAG="" if [[ "$GITHUB_REF" =~ "main" ]]; then - TAG="latest" + TAG="latest-24" elif [[ "$GITHUB_REF" =~ "stable" ]]; then - TAG="stable" + TAG="stable-24" else echo "Invalid Github ref $GITHUB_REF" exit 1 @@ -46,7 +46,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - push: true + push: false tags: p4lang/pi:${{ steps.get-tag.outputs.tag }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/Dockerfile b/Dockerfile index 8caef82f..f91ed242 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # Antonin Bas (antonin@barefootnetworks.com) -FROM p4lang/third-party:latest +FROM p4lang/third-party:latest-24 LABEL maintainer="P4 Developers " LABEL description="This Docker image includes only the most widely-used PI \ artifacts: PI core and P4Runtime. It does not include the Thrift-based PI \ @@ -40,8 +40,8 @@ ENV PI_DEPS automake \ libboost-thread-dev \ libtool \ pkg-config -ENV PI_RUNTIME_DEPS libboost-system1.71.0 \ - libboost-thread1.71.0 \ +ENV PI_RUNTIME_DEPS libboost-system1.74.0 \ + libboost-thread1.74.0 \ python3 \ python-is-python3 From ded412a4fa50d07b2c8c3e0889620fe8c8e89efd Mon Sep 17 00:00:00 2001 From: fruffy Date: Sun, 19 Apr 2026 12:02:49 -0400 Subject: [PATCH 2/2] Push a latest-24 image. --- .github/workflows/build.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87d979e5..264bf9ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,16 +1,13 @@ name: Build and push latest image on: + pull_request: + branches: + - main push: branches: - main - stable - schedule: - # We run it every 4 hours, starting at 02:15. - # Note that this will only update the 'latest' tag (not the 'stable' tag). - # Ideally, we would update the image every time the base image - # (p4lang/third-party) is updated, but we deem this good enough. - - cron: '15 2-23/4 * * *' # "At minute 15 past every 4th hour from 2 through 23." jobs: build: @@ -24,15 +21,7 @@ jobs: id: get-tag shell: bash run: | - TAG="" - if [[ "$GITHUB_REF" =~ "main" ]]; then - TAG="latest-24" - elif [[ "$GITHUB_REF" =~ "stable" ]]; then - TAG="stable-24" - else - echo "Invalid Github ref $GITHUB_REF" - exit 1 - fi + TAG="latest-24" echo "Tag is $TAG" echo "::set-output name=tag::$TAG" - name: Set up Docker Buildx @@ -46,7 +35,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . - push: false + push: true tags: p4lang/pi:${{ steps.get-tag.outputs.tag }} cache-from: type=gha cache-to: type=gha,mode=max