Skip to content

Commit

Permalink
fix(images,ci): fixed amd64 images build.
Browse files Browse the repository at this point in the history
Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
  • Loading branch information
FedeDP committed Jan 30, 2024
1 parent cf0b956 commit 537bf9f
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
architecture: [amd64, arm64]
arch: [amd64, arm64]
runs-on: ${{ (matrix.arch == 'arm64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
steps:
- name: Checkout repo
Expand Down
4 changes: 2 additions & 2 deletions images/x86_64/archlinux/5.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM archlinux:base
FROM archlinux:base-20220807.0.72894

WORKDIR /home/ubuntu

RUN echo 'Server=https://archive.archlinux.org/repos/2022/08/04/$repo/os/$arch' > /etc/pacman.d/mirrorlist && \
RUN printf 'SigLevel = Never\nServer=https://archive.archlinux.org/repos/2022/08/04/$repo/os/$arch' > /etc/pacman.d/mirrorlist && \
pacman -Syyu --noconfirm && \
pacman -S --noconfirm \
clang \
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/centos/4.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/centos/centos:stream8

ARG VERSION=4.18.0-497
ARG VERSION=4.18.0-536
ARG BASEOS_URL='http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages'

RUN dnf groupinstall -y 'Development Tools' && \
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/centos/4.18/Dockerfile.kernel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=4.18.0-497
ARG VERSION=4.18.0-536
ARG BASEOS_URL='http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages'
ARG ARCH=x86_64

Expand Down
3 changes: 1 addition & 2 deletions images/x86_64/centos/5.14/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
FROM quay.io/centos/centos:stream9

ARG VERSION=5.14.0-325
ARG BASEOS_URL='https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/Packages'
ARG VERSION=5.14.0-412
ARG APPSTR_URL='http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages'

RUN dnf groupinstall -y 'Development Tools' && \
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/centos/5.14/Dockerfile.kernel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VERSION=5.14.0-325
ARG VERSION=5.14.0-412
ARG BASEOS_URL='https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/Packages'
ARG APPSTR_URL='http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages'
ARG ARCH=x86_64
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/fedora/5.17/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM fedora:36

ARG VERSION=5.17.5-300
ARG HVERSION=5.17.0-300
ARG URL='https://mirrors.kernel.org/fedora/releases/36/Everything/x86_64/os/Packages'
ARG URL='https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/x86_64/os/Packages'

RUN dnf groupinstall -y 'Development Tools' && \
dnf install -y \
Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/ubuntu/6.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04

ARG VERSION=6.2.0-26-generic
ARG VERSION=6.2.0-41-generic

WORKDIR /home/ubuntu

Expand Down
2 changes: 1 addition & 1 deletion images/x86_64/ubuntu/6.2/Dockerfile.kernel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM initrd-builder:0.0.1 AS builder

ARG VERSION=6.2.0-26-generic
ARG VERSION=6.2.0-41-generic
ARG URL='http://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux/'

WORKDIR /home/ubuntu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:23.04

ARG VERSION=6.3.0-7
ARG VERSION=6.5.0-17
ARG URL='http://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux/'

WORKDIR /home/ubuntu
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM initrd-builder:0.0.1 AS builder

ARG VERSION=6.3.0-7-generic
ARG VERSION=6.5.0-17-generic
ARG URL='http://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux/'

WORKDIR /home/ubuntu
Expand Down

0 comments on commit 537bf9f

Please sign in to comment.