Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix image build #69

Merged
merged 3 commits into from
Jan 31, 2025
Merged
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
10 changes: 6 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
Expand All @@ -66,16 +66,18 @@ jobs:
run: cosign version

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:qemu-v8.1.5

- name: Setup Docker buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/version_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Get latest runner release
id: release
Expand All @@ -38,11 +38,11 @@ jobs:
run: sed -i 's#^ARG version=.*#ARG version=${{ steps.release.outputs.ACTIONS_VERSION}}#' s390x.Dockerfile

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v7
with:
title: "[automated] Bumping s390x containers to action-runners v${{ steps.release.outputs.ACTIONS_VERSION}}"
commit-message: "[automated] Bumping s390x containers to action-runners v${{ steps.release.outputs.ACTIONS_VERSION}}"
branch: "version-bump/${{ steps.release.outputs.ACTIONS_VERSION}}"
delete-branch: true
body: ""
reviewers: anakryiko, chantra, danielocfb, yurinnick
reviewers: anakryiko, chantra, danielocfb, yurinnick, theihor
26 changes: 16 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# hadolint ignore=DL3007
ARG UBUNTU_VERSION=focal
ARG UBUNTU_VERSION=noble
FROM myoung34/github-runner:ubuntu-${UBUNTU_VERSION}
# Redefining UBUNTU_VERSION without a value inherits the global default
ARG UBUNTU_VERSION

LABEL maintainer="[email protected]"

RUN apt-get update \
&& apt-get install -y cmake flex bison build-essential libssl-dev ncurses-dev xz-utils bc rsync libguestfs-tools qemu-kvm qemu-utils linux-image-generic zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils \
&& apt-get install -y g++ libelf-dev \
&& apt-get install -y iproute2 iputils-ping \
&& apt-get install -y cpu-checker qemu-kvm qemu-utils qemu-system-x86 qemu-system-s390x qemu-system-arm qemu-guest-agent ethtool keyutils iptables gawk \
&& echo "deb https://apt.llvm.org/${UBUNTU_VERSION}/ llvm-toolchain-${UBUNTU_VERSION} main" > /etc/apt/sources.list.d/llvm.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \
&& apt-get install -y clang lld llvm
RUN apt-get update -y && apt-get install -y \
bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
rsync software-properties-common sudo tree wget xz-utils zstd

RUN apt-get update -y && apt-get install -y \
binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev

RUN apt-get update -y && apt-get install -y \
qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils

# Install LLVM with automatic script (https://apt.llvm.org)
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

RUN apt-get clean
24 changes: 16 additions & 8 deletions s390x-native.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
# Self-Hosted IBM Z Github Actions Runner.
ARG UBUNTU_VERSION=noble
FROM --platform=linux/s390x ubuntu:${UBUNTU_VERSION}

Check warning on line 3 in s390x-native.Dockerfile

View workflow job for this annotation

GitHub Actions / build (noble, s390x)

FROM --platform flag should not use a constant value

FromPlatformFlagConstDisallowed: FROM --platform flag should not use constant value "linux/s390x" More info: https://docs.docker.com/go/dockerfile/rule/from-platform-flag-const-disallowed/
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get -y install \
bc bison cmake cpu-checker curl dumb-init ethtool flex gawk git \
iproute2 iptables iputils-ping jq keyutils linux-image-generic \
python3 rsync software-properties-common sudo tree wget zstd
RUN apt-get -y install \
qemu-guest-agent qemu-kvm qemu-utils \
qemu-system-arm qemu-system-s390x qemu-system-x86
RUN apt-get install -y \
RUN apt-get update -y && apt-get install -y \
bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
rsync software-properties-common sudo tree wget xz-utils zstd

RUN apt-get update -y && apt-get install -y \
binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev

RUN apt-get update -y && apt-get install -y \
qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils

# Install LLVM with automatic script (https://apt.llvm.org)
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

RUN apt-get update -y && apt-get install -y \
aspnetcore-runtime-8.0

RUN apt-get clean

ARG version=2.321.0
Expand Down