From dd2cbf777c35245614bbfcea3789863e49f44013 Mon Sep 17 00:00:00 2001 From: Roberto Gandolfo Hashioka Date: Fri, 26 May 2017 11:36:55 -0700 Subject: [PATCH] Add DISTRO/SUITE env. variables to the RPM dockerfiles Signed-off-by: Roberto Gandolfo Hashioka Upstream-commit: c4a9e41495fac5e4aa72151b80200aa453f65e08 Component: packaging --- components/packaging/rpm/centos-7/Dockerfile.x86_64 | 2 ++ components/packaging/rpm/fedora-24/Dockerfile.x86_64 | 2 ++ components/packaging/rpm/fedora-25/Dockerfile.x86_64 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index 01313c9dfd..dd6c9da1c1 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -18,6 +18,8 @@ RUN yum install -y \ vim-common ENV GO_VERSION 1.7.5 +ENV DISTRO centos +ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local RUN mkdir -p /go ENV GOPATH=/go diff --git a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 index 6666a296b8..17245bc8d7 100644 --- a/components/packaging/rpm/fedora-24/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-24/Dockerfile.x86_64 @@ -3,6 +3,8 @@ RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common ENV GO_VERSION 1.8.1 +ENV DISTRO fedora +ENV SUITE 24 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 diff --git a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 index e439f30b77..abcabe29d1 100644 --- a/components/packaging/rpm/fedora-25/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-25/Dockerfile.x86_64 @@ -3,6 +3,8 @@ RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common ENV GO_VERSION 1.8.1 +ENV DISTRO fedora +ENV SUITE 25 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1