Skip to content

Commit 1f076b0

Browse files
committed
Added support for Rhel 8 and SLES 15 for s390x
Added Dockerfile for rhel-8 and sles-15. Added spec files rpm/SPECS/checkpolicy.spec, rpm/SPECS/policycoreutils.spec for sles-15 support. Modified rpm/SPECS/docker-ce.spec for adding support for sles-15 with btrfs support. Modified rpm/Makefile to add support for sles-15 and rhel-8. Signed-off-by: Nirman Narang <[email protected]>
1 parent 3b70727 commit 1f076b0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

rpm/sles-15/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ARG DISTRO=sles
33
ARG SUITE=15
44
ARG BUILD_IMAGE=dockereng/${DISTRO}:${SUITE}-s390x
55

6+
67
FROM ${GO_IMAGE} AS golang
78

89
FROM ${BUILD_IMAGE}
@@ -21,14 +22,16 @@ ENV CC=gcc
2122
USER root
2223

2324

24-
RUN zypper install -y rpm-build rpmlint pkg-config libsystemd0 systemd-devel selinux-tools wget cmake device-mapper-devel git glibc-devel-static libseccomp-devel libtool libarchive-devel btrfsprogs libbtrfs-devel
25+
RUN zypper install -y rpm-build rpmlint pkg-config libsystemd0 systemd-devel selinux-tools wget cmake device-mapper-devel git glibc-devel-static libseccomp-devel libtool libarchive-devel btrfsprogs libbtrfs-devel lsb-release
2526

2627
COPY SPECS /usr/src/packages/SPECS
2728
COPY rpmbuild/SOURCES/ /usr/src/packages/SOURCES/
2829
RUN rpmbuild -bb /usr/src/packages/SPECS/policycoreutils.spec
2930
RUN rpmbuild -bb /usr/src/packages/SPECS/checkpolicy.spec
3031
RUN rpm -i /usr/src/packages/RPMS/s390x/policycoreutils-3.2-1.s390x.rpm && rpm -i /usr/src/packages/RPMS/s390x/checkpolicy-3.2.61.1-1.s390x.rpm \
31-
&& zypper addrepo https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP2/security:SELinux.repo \
32+
&& sles_version=$(lsb_release -r | rev | cut -c1) \
33+
&& opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/SLE_15_SP$sles_version/security:SELinux.repo" \
34+
&& zypper addrepo $opensuse_repo \
3235
&& zypper --gpg-auto-import-keys refresh && zypper install -y selinux-policy selinux-policy-devel \
3336
&& mkdir -p /root/rpmbuild/ && cp -r /usr/src/packages/* /root/rpmbuild/
3437

0 commit comments

Comments
 (0)