While hack/make.sh checks for systemd headers using pkg-config, we forgot to ensure that they were there in the images that we use for building binaries for RPM-based distributions. Add the right packages to the generate.sh that we use for them, and update the copies of the generated files that we carry in the source tree. Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in the "pkgconfig" package, while OpenSUSE calls the package "pkg-config". The systemd-devel package, like systemd, is not in Oracle Linux 6. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> Upstream-commit: 7d4f52ec6bd8058cc55860cf5ff1a81a3fbe8f9d Component: engine
18 lines
570 B
Docker
18 lines
570 B
Docker
#
|
|
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"!
|
|
#
|
|
|
|
FROM oraclelinux:7
|
|
|
|
RUN yum groupinstall -y "Development Tools"
|
|
RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar
|
|
|
|
ENV GO_VERSION 1.5.3
|
|
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
|
ENV PATH $PATH:/usr/local/go/bin
|
|
|
|
ENV AUTO_GOPATH 1
|
|
|
|
ENV DOCKER_BUILDTAGS selinux
|
|
|