Re-order common env variables

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
(cherry picked from commit c1a42f9)


Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Upstream-commit: 91e273a892db06e195b0e66a4446b7b9830306b1
Component: packaging

Author: zelahi

components/packaging/rpm/centos-7/Dockerfile

@@ -5,13 +5,13 @@ FROM ${GO_IMAGE} as golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=direct
 ENV GO111MODULE=off
-ENV DISTRO centos
-ENV SUITE 7
 ENV GOPATH=/go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
+ENV DISTRO centos
+ENV SUITE 7
 RUN yum install -y rpm-build rpmlint
 COPY SPECS /root/rpmbuild/SPECS
 # Overwrite repo that was failing on aarch64

components/packaging/rpm/fedora-29/Dockerfile

@@ -5,13 +5,13 @@ FROM ${GO_IMAGE} as golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=direct
 ENV GO111MODULE=off
-ENV DISTRO fedora
-ENV SUITE 29
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
+ENV DISTRO fedora
+ENV SUITE 29
 RUN dnf install -y rpm-build rpmlint dnf-plugins-core
 COPY SPECS /root/rpmbuild/SPECS
 RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec

components/packaging/rpm/fedora-30/Dockerfile

@@ -5,13 +5,13 @@ FROM ${GO_IMAGE} as golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=direct
 ENV GO111MODULE=off
-ENV DISTRO fedora
-ENV SUITE 30
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
+ENV DISTRO fedora
+ENV SUITE 30
 RUN dnf install -y rpm-build rpmlint dnf-plugins-core
 COPY SPECS /root/rpmbuild/SPECS
 RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec

components/packaging/rpm/fedora-31/Dockerfile

@@ -5,13 +5,13 @@ FROM ${GO_IMAGE} as golang
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=direct
 ENV GO111MODULE=off
-ENV DISTRO fedora
-ENV SUITE 31
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS seccomp selinux
 ENV RUNC_BUILDTAGS seccomp selinux
+ENV DISTRO fedora
+ENV SUITE 31
 RUN dnf install -y rpm-build rpmlint dnf-plugins-core
 COPY SPECS /root/rpmbuild/SPECS
 RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec