Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cache: false

- name: Set up Docker
uses: docker/setup-docker-action@v4
uses: docker/setup-docker-action@v5

- name: Run tests
run: make test
Expand All @@ -54,7 +54,7 @@ jobs:
uses: actions/checkout@v6

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: metal-stack
Expand All @@ -74,7 +74,7 @@ jobs:
cache: false

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Make SEMVER_PATCH
run: |
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
sudo cp test/lz4 /usr/bin/lz4

- name: Build docker image for workers
uses: docker/bake-action@v6
uses: docker/bake-action@v7
with:
source: .
files: ./docker-bake.hcl
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
if: ${{ matrix.os.name == 'ubuntu' }}

- name: Build docker image for firewalls
uses: docker/bake-action@v6
uses: docker/bake-action@v7
with:
source: .
files: ./docker-bake.hcl
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
if: ${{ matrix.os.name == 'ubuntu' }}

- name: Build docker image for capms
uses: docker/bake-action@v6
uses: docker/bake-action@v7
with:
source: .
files: ./docker-bake.hcl
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
if: ${{ matrix.os.name == 'debian' }}

- name: Build docker image for debian-nvidia
uses: docker/bake-action@v6
uses: docker/bake-action@v7
with:
source: .
files: ./docker-bake.hcl
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
uses: actions/checkout@v6

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: metal-stack
Expand All @@ -275,7 +275,7 @@ jobs:
cache: false

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Make SEMVER_PATCH
run: |
Expand All @@ -294,7 +294,7 @@ jobs:
SEMVER_MAJOR_MINOR: 9

- name: Build image
uses: docker/bake-action@v6
uses: docker/bake-action@v7
with:
source: .
files: ./docker-bake.hcl
Expand All @@ -303,7 +303,7 @@ jobs:
set: _common.output+=type=registry
env:
OS_NAME: almalinux
SEMVER_MAJOR_MINOR: 9
SEMVER_MAJOR_MINOR: 10
SEMVER_PATCH: ${{ env.SEMVER_PATCH }}

- name: Test and export docker image for almalinux based workers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
"firewall/3.0-ubuntu",
"debian/13",
"debian-nvidia/13",
"almalinux/9",
"almalinux/10",
]

- name: Update release body
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ firewall: test binary

.PHONY: almalinux
almalinux: test binary
mkdir -p "images/almalinux/9"
OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=9 docker buildx bake --no-cache almalinux
OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=9 ./test.sh
mkdir -p "images/almalinux/10"
OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=10 docker buildx bake --no-cache almalinux
OS_NAME=almalinux OUTPUT_FOLDER="" SEMVER_MAJOR_MINOR=10 ./test.sh
4 changes: 2 additions & 2 deletions almalinux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_OS_VERSION=9
ARG BASE_OS_VERSION=10

FROM golang:1.22-bullseye AS ignition-builder
ARG IGNITION_BRANCH
Expand Down Expand Up @@ -80,7 +80,7 @@ RUN curl -fLsS https://github.com/metal-stack/go-lldpd/releases/download/${GOLLD

# Install FRR see https://rpm.frrouting.org/ for available channels
RUN set -ex \
&& curl -fLsS https://rpm.frrouting.org/repo/${FRR_VERSION}-repo.el9.noarch.rpm -o /tmp/frr-repo.rpm \
&& curl -fLsS https://rpm.frrouting.org/repo/${FRR_VERSION}-repo.el10.noarch.rpm -o /tmp/frr-repo.rpm \
&& dnf install -y /tmp/frr-repo.rpm \
&& dnf install -y frr frr-pythontools

Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ target "almalinux" {
ctx = "./almalinux/context"
}
args = {
BASE_OS_VERSION = 9
BASE_OS_VERSION = 10
FRR_VERSION="frr-stable"
}
tags = ["ghcr.io/metal-stack/almalinux:${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}"]
Expand Down
Loading