Skip to content

Commit 9d28bec

Browse files
authored
Merge pull request #658 from thaJeztah/add_fedora_36
[master] rpm: add Fedora 36
2 parents 5d57e0b + ef33edc commit 9d28bec

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ def pkgs = [
99
[target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (Next stable)
1010
[target: "fedora-34", image: "fedora:34", arches: ["amd64", "aarch64"]], // EOL: May 17, 2022
1111
[target: "fedora-35", image: "fedora:35", arches: ["amd64", "aarch64"]], // EOL: November 30, 2022
12+
[target: "fedora-36", image: "fedora:36", arches: ["amd64", "aarch64"]], // EOL: May 24, 2023
1213
[target: "raspbian-buster", image: "balenalib/rpi-raspbian:buster", arches: ["armhf"]], // Debian/Raspbian 10 (EOL: 2024)
1314
[target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (Next stable)
1415
[target: "ubuntu-bionic", image: "ubuntu:bionic", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 18.04 LTS (End of support: April, 2023. EOL: April, 2028)

rpm/fedora-36/Dockerfile

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
ARG GO_IMAGE
2+
ARG DISTRO=fedora
3+
ARG SUITE=36
4+
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
5+
6+
FROM ${GO_IMAGE} AS golang
7+
8+
FROM ${BUILD_IMAGE}
9+
ENV GOPROXY=direct
10+
ENV GO111MODULE=off
11+
ENV GOPATH /go
12+
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
13+
ENV AUTO_GOPATH 1
14+
ENV DOCKER_BUILDTAGS seccomp selinux
15+
ENV RUNC_BUILDTAGS seccomp selinux
16+
ARG DISTRO
17+
ARG SUITE
18+
ENV DISTRO=${DISTRO}
19+
ENV SUITE=${SUITE}
20+
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
21+
COPY SPECS /root/rpmbuild/SPECS
22+
23+
# TODO change once we support scan-plugin on other architectures
24+
RUN \
25+
if [ "$(uname -m)" = "x86_64" ]; then \
26+
dnf builddep -y /root/rpmbuild/SPECS/*.spec; \
27+
else \
28+
dnf builddep -y /root/rpmbuild/SPECS/docker-c*.spec; \
29+
fi
30+
31+
COPY --from=golang /usr/local/go /usr/local/go
32+
WORKDIR /root/rpmbuild
33+
ENTRYPOINT ["/bin/rpmbuild"]

0 commit comments

Comments
 (0)