Skip to content

Commit 506adfd

Browse files
committed
push bird 2.16 and 3.0.0
1 parent bc6b774 commit 506adfd

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/docker.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: Create and publish a Docker image
22
on:
33
push:
44
branches: [ "main" ]
5-
workflow_run:
6-
workflows: [ "Rust" ]
7-
types:
8-
- completed
95

106
env:
117
REGISTRY: ghcr.io
@@ -19,7 +15,13 @@ jobs:
1915
matrix:
2016
include:
2117
- dockerfile: ./bird/Dockerfile
22-
image: ghcr.io/nxthdr/bird
18+
image: ghcr.io/nxthdr/bird:2.16
19+
build-args: |
20+
BIRD_VERSION=2.16
21+
- dockerfile: ./bird/Dockerfile
22+
image: ghcr.io/nxthdr/bird:3.0.0
23+
build-args: |
24+
BIRD_VERSION=3.0.0
2325
permissions:
2426
contents: read
2527
packages: write
@@ -43,7 +45,7 @@ jobs:
4345
with:
4446
images: ${{ matrix.image }}
4547

46-
- name: Sync theme submodule
48+
- name: Sync theme submodule
4749
run: git submodule sync && git submodule update --init --recursive
4850

4951
- name: Build and push Docker image
@@ -52,9 +54,10 @@ jobs:
5254
with:
5355
context: .
5456
file: ${{ matrix.dockerfile }}
55-
push: true
57+
build-args: ${{ matrix.build-args }}
5658
tags: ${{ steps.meta.outputs.tags }}
5759
labels: ${{ steps.meta.outputs.labels }}
60+
push: true
5861

5962
- name: Generate artifact attestation
6063
uses: actions/attest-build-provenance@v2

bird/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM ubuntu:24.04 AS builder
22

3-
ARG BIRD_VERION=2.15.1
3+
ARG BIRD_VERSION=2.15.1
44
ARG BIRD_PROTOCOLS=bmp,bgp,rpki,static
55

6-
RUN apt update -y && \
6+
RUN apt update -y && \
77
apt install -y --no-install-recommends --no-install-suggests \
88
bison \
99
ca-certificates \
@@ -17,10 +17,10 @@ RUN apt update -y && \
1717
make \
1818
&& rm -rf /var/lib/apt/lists/*
1919

20-
RUN curl -o /tmp/bird-${BIRD_VERION}.tar.gz https://bird.network.cz/download/bird-${BIRD_VERION}.tar.gz
21-
RUN tar xvzf /tmp/bird-${BIRD_VERION}.tar.gz -C /tmp
20+
RUN curl -o /tmp/bird-${BIRD_VERSION}.tar.gz https://bird.network.cz/download/bird-${BIRD_VERSION}.tar.gz
21+
RUN tar xvzf /tmp/bird-${BIRD_VERSION}.tar.gz -C /tmp
2222

23-
RUN cd /tmp/bird-${BIRD_VERION} \
23+
RUN cd /tmp/bird-${BIRD_VERSION} \
2424
&& ./configure \
2525
--prefix=/usr/ \
2626
--sysconfdir=/etc/bird/ \

0 commit comments

Comments
 (0)