Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

chore(deps): update dependency containers/buildah to v1.31.0 #6728

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
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
42 changes: 12 additions & 30 deletions tools/buildah/Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,38 +1,20 @@
#syntax=docker/dockerfile:1.5.2
#syntax=docker/dockerfile:1.6.0

ARG ref=main

FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
FROM nixos/nix:2.16.1@sha256:f41a29be267750fdbbeb3d46c5b8899149ac92fb390cee74ab7c0a2487dce5b2 AS prepare
ARG name
ARG version
RUN <<EOF
apt-get update
apt-get -y install --no-install-recommends \
git \
ca-certificates \
make \
gcc \
bats \
btrfs-progs \
libapparmor-dev \
libdevmapper-dev \
libglib2.0-dev \
libgpgme11-dev \
libseccomp-dev \
libselinux1-dev \
golang-go \
go-md2man
EOF
WORKDIR /tmp/buildah
RUN git clone --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/containers/buildah .
ENV CFLAGS='-static -pthread' \
LDFLAGS='-s -w -static-libgcc -static' \
EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"' \
BUILDTAGS='static netgo osusergo exclude_graphdriver_btrfs exclude_graphdriver_devicemapper seccomp apparmor selinux' \
CGO_ENABLED=1
RUN git clone --config advice.detachedHead=false --depth 1 --recursive --branch "v${version}" https://github.com/containers/buildah.git .
RUN <<EOF
make all
mkdir -p /usr/local/share/bash-completion/completions
cp contrib/completions/bash/buildah /usr/local/share/bash-completion/completions/
make install DESTDIR="${prefix}" PREFIX="${target}"
nix build --extra-experimental-features nix-command -f nix/
mkdir -p ./bin
cp -rfp ./result/bin/* ./bin/
find . -type f

cp ./bin/buildah "${prefix}${target}/bin/"
cp docs/buildah*.1 "${prefix}${target}/share/man/man1/"
cp docs/links/buildah*.1 "${prefix}${target}/share/man/man1/"
find "${prefix}${target}" -type f
EOF
2 changes: 1 addition & 1 deletion tools/buildah/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: buildah
version: "1.30.0"
version: "1.31.1"
check: ${binary} --version | cut -d' ' -f3
runtime_dependencies:
- runc
Expand Down