push bird 2.16 and 3.0.0

nxthdr · Jan 3, 2025 · 9ad516d · 9ad516d
1 parent bc6b774
commit 9ad516d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -2,10 +2,6 @@ name: Create and publish a Docker image
 on:
   push:
     branches: [ "main" ]
-  workflow_run:
-    workflows: [ "Rust" ]
-    types:
-      - completed
 
 env:
   REGISTRY: ghcr.io
@@ -19,7 +15,13 @@ jobs:
       matrix:
         include:
           - dockerfile: ./bird/Dockerfile
-            image: ghcr.io/nxthdr/bird
+            image: ghcr.io/nxthdr/bird:2.16
+            build-args:
+              - BIRD_VERSION=2.16
+          - dockerfile: ./bird/Dockerfile
+            image: ghcr.io/nxthdr/bird:3.0.0
+            build-args:
+              - BIRD_VERSION=3.0.0
     permissions:
       contents: read
       packages: write
@@ -43,7 +45,7 @@ jobs:
         with:
           images: ${{ matrix.image }}
 
-      - name: Sync theme submodule 
+      - name: Sync theme submodule
         run: git submodule sync && git submodule update --init --recursive
 
       - name: Build and push Docker image
@@ -52,9 +54,10 @@ jobs:
         with:
           context: .
           file: ${{ matrix.dockerfile }}
-          push: true
+          build-args: ${{ matrix.build-args }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          push: true
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2

diff --git a/bird/Dockerfile b/bird/Dockerfile
@@ -1,9 +1,9 @@
 FROM ubuntu:24.04 AS builder
 
-ARG BIRD_VERION=2.15.1
+ARG BIRD_VERSION=2.15.1
 ARG BIRD_PROTOCOLS=bmp,bgp,rpki,static
 
-RUN apt update -y  &&  \ 
+RUN apt update -y  &&  \
     apt install -y --no-install-recommends --no-install-suggests \
         bison \
         ca-certificates \
@@ -17,10 +17,10 @@ RUN apt update -y  &&  \
         make \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl -o /tmp/bird-${BIRD_VERION}.tar.gz https://bird.network.cz/download/bird-${BIRD_VERION}.tar.gz
-RUN tar xvzf /tmp/bird-${BIRD_VERION}.tar.gz -C /tmp
+RUN curl -o /tmp/bird-${BIRD_VERSION}.tar.gz https://bird.network.cz/download/bird-${BIRD_VERSION}.tar.gz
+RUN tar xvzf /tmp/bird-${BIRD_VERSION}.tar.gz -C /tmp
 
-RUN cd /tmp/bird-${BIRD_VERION} \
+RUN cd /tmp/bird-${BIRD_VERSION} \
     && ./configure \
         --prefix=/usr/ \
         --sysconfdir=/etc/bird/ \