Merge pull request #5 from rogaha/add_distro_to_rpms

Add DISTRO/SUITE env. variables to the RPM dockerfiles
docker-archive · May 26, 2017 · c259b01 · c259b01
2 parents 3c70b56 + c4a9e41
commit c259b01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/rpm/centos-7/Dockerfile.x86_64 b/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/rpm/fedora-24/Dockerfile.x86_64 b/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/rpm/fedora-25/Dockerfile.x86_64 b/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