Merge branch 'master' into update-readme

Author: seemethere

README.md

@@ -16,6 +16,5 @@ The scripts will build for this list of packages types:
 * RPM packages for Fedora 31
 * RPM packages for Fedora 30
 * RPM packages for Fedora 29
-* RPM packages for Fedora 28
 * RPM packages for CentOS 7
 * TGZ and ZIP files with static binaries

deb/debian-buster/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/debian-stretch/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/raspbian-buster/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/raspbian-stretch/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/ubuntu-bionic/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/ubuntu-cosmic/Dockerfile

@@ -12,6 +12,8 @@ RUN if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/ubuntu-disco/Dockerfile

@@ -12,6 +12,8 @@ RUN if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

deb/ubuntu-xenial/Dockerfile

@@ -6,6 +6,8 @@ FROM ${BUILD_IMAGE}
 
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
+ENV GOPROXY=direct
+ENV GO111MODULE=off
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

rpm/Makefile

@@ -42,7 +42,7 @@ RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 SOURCE_FILES=engine-image engine.tgz cli.tgz docker.service docker.socket distribution_based_engine.json plugin-installers.tgz
 SOURCES=$(addprefix rpmbuild/SOURCES/, $(SOURCE_FILES))
 
-FEDORA_RELEASES := fedora-31 fedora-30 fedora-29 fedora-28
+FEDORA_RELEASES := fedora-31 fedora-30 fedora-29
 CENTOS_RELEASES := centos-7
 
 .PHONY: help