From 0994dbd1ea4e056422ce41ae9b320480d40c45ac Mon Sep 17 00:00:00 2001 From: corbin-coleman Date: Mon, 21 May 2018 15:53:53 -0700 Subject: [PATCH 1/3] Set GO_VERSION with a build arg Use a variable in the Makefile to set the GO_VERSION for the builds. GO_VERSION is defaulted in all Makefiles as `1.10.2`, but can be set when running make: `make GO_VERSION=1.10.1 deb`. Signed-off-by: corbin-coleman Upstream-commit: 0fe741746287335a5ba4afaf06be301915324e5a Component: packaging --- components/packaging/Makefile | 7 ++++--- components/packaging/deb/Makefile | 3 ++- components/packaging/deb/debian-buster/Dockerfile.aarch64 | 3 ++- components/packaging/deb/debian-buster/Dockerfile.armv7l | 3 ++- components/packaging/deb/debian-buster/Dockerfile.x86_64 | 3 ++- components/packaging/deb/debian-jessie/Dockerfile.aarch64 | 3 ++- components/packaging/deb/debian-jessie/Dockerfile.armv7l | 3 ++- components/packaging/deb/debian-jessie/Dockerfile.x86_64 | 3 ++- components/packaging/deb/debian-stretch/Dockerfile.aarch64 | 3 ++- components/packaging/deb/debian-stretch/Dockerfile.armv7l | 3 ++- components/packaging/deb/debian-stretch/Dockerfile.x86_64 | 3 ++- components/packaging/deb/raspbian-jessie/Dockerfile.armv7l | 3 ++- .../packaging/deb/raspbian-stretch/Dockerfile.armv7l | 3 ++- components/packaging/deb/ubuntu-artful/Dockerfile.armv7l | 3 ++- components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le | 3 ++- components/packaging/deb/ubuntu-artful/Dockerfile.s390x | 3 ++- components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 | 3 ++- components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 | 3 ++- components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l | 3 ++- components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le | 3 ++- components/packaging/deb/ubuntu-bionic/Dockerfile.s390x | 3 ++- components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 | 3 ++- components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l | 3 ++- components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 | 3 ++- components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 | 3 ++- components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l | 3 ++- components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le | 3 ++- components/packaging/deb/ubuntu-xenial/Dockerfile.s390x | 3 ++- components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 | 3 ++- components/packaging/rpm/Makefile | 7 ++++--- components/packaging/rpm/centos-7/Dockerfile.aarch64 | 3 ++- components/packaging/rpm/centos-7/Dockerfile.x86_64 | 3 ++- components/packaging/rpm/fedora-27/Dockerfile.aarch64 | 3 ++- components/packaging/rpm/fedora-27/Dockerfile.x86_64 | 3 ++- components/packaging/rpm/fedora-28/Dockerfile.aarch64 | 3 ++- components/packaging/rpm/fedora-28/Dockerfile.x86_64 | 3 ++- 36 files changed, 76 insertions(+), 40 deletions(-) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 67027315cd..536107b077 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -3,6 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../engine CLI_DIR:=$(CURDIR)/../cli VERSION?=0.0.0-dev DOCKER_GITCOMMIT:=abcdefg +GO_VERSION:=1.10.2 .PHONY: help help: ## show make targets @@ -18,19 +19,19 @@ clean: ## remove build artifacts rpm: DOCKER_BUILD_PKGS:=$(shell find rpm -type d | grep ".*-.*" | sed 's/^rpm\///') rpm: ## build rpm packages for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) GO_VERSION=$(GO_VERSION) $${p}; \ done .PHONY: deb deb: DOCKER_BUILD_PKGS:=$(shell find deb -type d | grep ".*-.*" | sed 's/^deb\///') deb: ## build deb packages for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) GO_VERSION=$(GO_VERSION) $${p}; \ done .PHONY: static static: DOCKER_BUILD_PKGS:=static-linux cross-mac cross-win cross-arm static: ## build static-compiled packages for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) GO_VERSION=$(GO_VERSION) $${p}; \ done diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index f871d13ca8..0760b9a0e7 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -4,11 +4,12 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev +GO_VERSION:=1.10.2 DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown EPOCH?= -BUILD=docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . +BUILD=docker build --build-arg GO_VERSION=$(GO_VERSION) -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . RUN=docker run --rm -i \ -e EPOCH='$(EPOCH)' \ -e DEB_VERSION=$(DEB_VERSION) \ diff --git a/components/packaging/deb/debian-buster/Dockerfile.aarch64 b/components/packaging/deb/debian-buster/Dockerfile.aarch64 index 4681c6572c..ed9e9729d0 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-buster/Dockerfile.aarch64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-buster/Dockerfile.armv7l b/components/packaging/deb/debian-buster/Dockerfile.armv7l index fc182a595e..3e3decf32c 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.armv7l +++ b/components/packaging/deb/debian-buster/Dockerfile.armv7l @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-buster/Dockerfile.x86_64 b/components/packaging/deb/debian-buster/Dockerfile.x86_64 index b4826a9a2d..795d523fb7 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-buster/Dockerfile.x86_64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 index f745681645..2f4d6ede74 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev libudev-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armv7l b/components/packaging/deb/debian-jessie/Dockerfile.armv7l index c1dbc2c305..7d58ef4a2b 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/debian-jessie/Dockerfile.armv7l @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 index 47015d44b0..9b930d00ca 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.aarch64 b/components/packaging/deb/debian-stretch/Dockerfile.aarch64 index 7a4a59e8a2..e5fb49d416 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.aarch64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armv7l b/components/packaging/deb/debian-stretch/Dockerfile.armv7l index 621501703b..333b2ef83f 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/debian-stretch/Dockerfile.armv7l @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 index 0ed70da3e9..7f793b05a7 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 @@ -6,7 +6,8 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l index 8e5de370a5..38309f3331 100644 --- a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l @@ -6,7 +6,8 @@ RUN sed -ri "s/archive.raspbian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l index 9edde3e6c2..6643e5b92f 100644 --- a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l @@ -6,7 +6,8 @@ RUN sed -ri "s/archive.raspbian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l index 05d4acfa28..5bc8943e14 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l @@ -2,7 +2,8 @@ FROM arm32v7/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le index 5553912daa..f242c67541 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le @@ -2,7 +2,8 @@ FROM ppc64le/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x index 870dbb9394..5a0f1bb27d 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x @@ -2,7 +2,8 @@ FROM s390x/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 index 3f56620b37..64f16fe9db 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 index 0607bc94a9..dca3be597a 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 @@ -2,7 +2,8 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l b/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l index 4d77561bce..8524a66e66 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l @@ -2,7 +2,8 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le index 004dcc4999..9afd22e356 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le @@ -2,7 +2,8 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x b/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x index 81ac619173..39b8ba521f 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x @@ -2,7 +2,8 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 index bf2a921dda..e53fd2c67a 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l index 01f303ce45..ee4b13306e 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l @@ -4,7 +4,8 @@ FROM arm32v7/ubuntu:trusty RUN sed -i 's|security.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|' /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 index 78dda28f25..61efbde39f 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 index adcf56fdb8..862a319b9e 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 @@ -2,7 +2,8 @@ FROM arm64v8/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l index af2543c26d..ea7d9f6574 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l @@ -2,7 +2,8 @@ FROM arm32v7/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le index da38192f2f..5f79347cd7 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le @@ -2,7 +2,8 @@ FROM ppc64le/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x index f79fcff634..eaef2ef2e6 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x @@ -2,7 +2,8 @@ FROM s390x/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 index 934852aa28..83fbedaa4e 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 18fdcd2322..71b3d582da 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -3,6 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev +GO_VERSION:=1.10.2 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown RPMBUILD=docker run --privileged --rm -i\ @@ -39,19 +40,19 @@ centos: centos-7 ## build all centos rpm packages .PHONY: fedora-28 fedora-28: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-28 rpm packages - docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ + docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild .PHONY: fedora-27 fedora-27: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-27 rpm packages - docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ + docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild .PHONY: centos-7 centos-7: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build centos-7 rpm packages - docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ + docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild diff --git a/components/packaging/rpm/centos-7/Dockerfile.aarch64 b/components/packaging/rpm/centos-7/Dockerfile.aarch64 index 5403a1b3d2..52edf9dabd 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.aarch64 +++ b/components/packaging/rpm/centos-7/Dockerfile.aarch64 @@ -17,7 +17,8 @@ RUN yum install -y \ rpmdevtools \ vim-common -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO centos ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index c6c1fd5344..5c11470cb6 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -17,7 +17,8 @@ RUN yum install -y \ rpmdevtools \ vim-common -ENV GO_VERSION 1.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO centos ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 index 46f50e3bdb..98fc2f5973 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 @@ -2,7 +2,8 @@ FROM arm64v8/fedora:27 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.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 27 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 index 5b8415fdbe..dd0c456b61 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM fedora:27 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.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 27 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 index 5c34daf575..9e9c457b3a 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 @@ -2,7 +2,8 @@ FROM fedora:28 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.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 28 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 index 19e8bf843a..2df74f8ee1 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 @@ -2,7 +2,8 @@ FROM fedora:28 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.10.2 +ARG GO_VERSION +ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 28 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local From 15e10105c87554f68d26f508f29f497e2f568d13 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 22 May 2018 14:56:08 +0200 Subject: [PATCH 2/3] Remove pigz requirement for CentOS The pigz binary is used to improve performance when pulling images, but is not available in the default CentOS package repositories. Given that RPM's don't have a "recommends" option, it's better to remove it as a requirement for now, instead of failing to install for some users. Signed-off-by: Sebastiaan van Stijn Upstream-commit: abb1f117d3736fdcbbcc15ecef3e36d1f47c63fa Component: packaging --- components/packaging/rpm/centos-7/docker-ce.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 82b5042423..9a65893c5a 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -28,7 +28,6 @@ Requires: libcgroup Requires: systemd-units Requires: tar Requires: xz -Requires: pigz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 From 2723d4de1cbf0b3586fcf94d540302709610ca66 Mon Sep 17 00:00:00 2001 From: corbin-coleman Date: Tue, 22 May 2018 10:56:53 -0700 Subject: [PATCH 3/3] Remove ENV GO_VERSION Signed-off-by: corbin-coleman Upstream-commit: 0f1be47e8644032d7c3cfa1762d20ec41a123a0f Component: packaging --- components/packaging/deb/debian-buster/Dockerfile.aarch64 | 1 - components/packaging/deb/debian-buster/Dockerfile.armv7l | 1 - components/packaging/deb/debian-buster/Dockerfile.x86_64 | 1 - components/packaging/deb/debian-jessie/Dockerfile.aarch64 | 1 - components/packaging/deb/debian-jessie/Dockerfile.armv7l | 1 - components/packaging/deb/debian-jessie/Dockerfile.x86_64 | 1 - components/packaging/deb/debian-stretch/Dockerfile.aarch64 | 1 - components/packaging/deb/debian-stretch/Dockerfile.armv7l | 1 - components/packaging/deb/debian-stretch/Dockerfile.x86_64 | 1 - components/packaging/deb/raspbian-jessie/Dockerfile.armv7l | 1 - components/packaging/deb/raspbian-stretch/Dockerfile.armv7l | 1 - components/packaging/deb/ubuntu-artful/Dockerfile.armv7l | 1 - components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le | 1 - components/packaging/deb/ubuntu-artful/Dockerfile.s390x | 1 - components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 | 1 - components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 | 1 - components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l | 1 - components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le | 1 - components/packaging/deb/ubuntu-bionic/Dockerfile.s390x | 1 - components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 | 1 - components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l | 1 - components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 | 1 - components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 | 1 - components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l | 1 - components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le | 1 - components/packaging/deb/ubuntu-xenial/Dockerfile.s390x | 1 - components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 | 1 - components/packaging/rpm/centos-7/Dockerfile.aarch64 | 1 - components/packaging/rpm/centos-7/Dockerfile.x86_64 | 1 - components/packaging/rpm/fedora-27/Dockerfile.aarch64 | 1 - components/packaging/rpm/fedora-27/Dockerfile.x86_64 | 1 - components/packaging/rpm/fedora-28/Dockerfile.aarch64 | 1 - components/packaging/rpm/fedora-28/Dockerfile.x86_64 | 1 - 33 files changed, 33 deletions(-) diff --git a/components/packaging/deb/debian-buster/Dockerfile.aarch64 b/components/packaging/deb/debian-buster/Dockerfile.aarch64 index ed9e9729d0..1412f995c9 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-buster/Dockerfile.aarch64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-buster/Dockerfile.armv7l b/components/packaging/deb/debian-buster/Dockerfile.armv7l index 3e3decf32c..37f8d10ecb 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.armv7l +++ b/components/packaging/deb/debian-buster/Dockerfile.armv7l @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-buster/Dockerfile.x86_64 b/components/packaging/deb/debian-buster/Dockerfile.x86_64 index 795d523fb7..2977d5ec31 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-buster/Dockerfile.x86_64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 index 2f4d6ede74..f5935f3ff6 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.aarch64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev libudev-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armv7l b/components/packaging/deb/debian-jessie/Dockerfile.armv7l index 7d58ef4a2b..32086270d8 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/debian-jessie/Dockerfile.armv7l @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 index 9b930d00ca..ee276885b8 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-jessie/Dockerfile.x86_64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.aarch64 b/components/packaging/deb/debian-stretch/Dockerfile.aarch64 index e5fb49d416..4686b6d8d6 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.aarch64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armv7l b/components/packaging/deb/debian-stretch/Dockerfile.armv7l index 333b2ef83f..0b048ee1ef 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/debian-stretch/Dockerfile.armv7l @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 index 7f793b05a7..e6585eefd6 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-stretch/Dockerfile.x86_64 @@ -7,7 +7,6 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l index 38309f3331..fbd8208399 100644 --- a/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-jessie/Dockerfile.armv7l @@ -7,7 +7,6 @@ RUN sed -ri "s/archive.raspbian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l index 6643e5b92f..b075039b9f 100644 --- a/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/raspbian-stretch/Dockerfile.armv7l @@ -7,7 +7,6 @@ RUN sed -ri "s/archive.raspbian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l index 5bc8943e14..a30ecdae34 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l @@ -3,7 +3,6 @@ FROM arm32v7/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le index f242c67541..71f8fc1cdb 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le @@ -3,7 +3,6 @@ FROM ppc64le/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x index 5a0f1bb27d..0cd2e9a951 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x @@ -3,7 +3,6 @@ FROM s390x/ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 index 64f16fe9db..cd5c204e13 100644 --- a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 @@ -3,7 +3,6 @@ FROM ubuntu:artful RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 index dca3be597a..7d30697ef2 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.aarch64 @@ -3,7 +3,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l b/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l index 8524a66e66..a005c88fc0 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.armv7l @@ -3,7 +3,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le index 9afd22e356..3c84844247 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.ppc64le @@ -3,7 +3,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x b/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x index 39b8ba521f..8a9ababfbc 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.s390x @@ -3,7 +3,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 index e53fd2c67a..c7ae56012e 100644 --- a/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-bionic/Dockerfile.x86_64 @@ -3,7 +3,6 @@ FROM ubuntu:bionic RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l index ee4b13306e..98b6dabb20 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l @@ -5,7 +5,6 @@ RUN sed -i 's|security.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|' /etc/ap RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 index 61efbde39f..b155e964e0 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.x86_64 @@ -3,7 +3,6 @@ FROM ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 index 862a319b9e..2b349ddd7d 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 @@ -3,7 +3,6 @@ FROM arm64v8/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local ENV GOPATH /go diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l index ea7d9f6574..74861d7c44 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l @@ -3,7 +3,6 @@ FROM arm32v7/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le index 5f79347cd7..99dffa363f 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.ppc64le @@ -3,7 +3,6 @@ FROM ppc64le/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x index eaef2ef2e6..85dccfc8b5 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x @@ -3,7 +3,6 @@ FROM s390x/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 index 83fbedaa4e..9e19d720e7 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.x86_64 @@ -3,7 +3,6 @@ FROM ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION -ENV GO_VERSION $GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV GOPATH /go ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin diff --git a/components/packaging/rpm/centos-7/Dockerfile.aarch64 b/components/packaging/rpm/centos-7/Dockerfile.aarch64 index 52edf9dabd..53517be33f 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.aarch64 +++ b/components/packaging/rpm/centos-7/Dockerfile.aarch64 @@ -18,7 +18,6 @@ RUN yum install -y \ vim-common ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO centos ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index 5c11470cb6..7cdc495480 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -18,7 +18,6 @@ RUN yum install -y \ vim-common ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO centos ENV SUITE 7 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 index 98fc2f5973..c62395c725 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 @@ -3,7 +3,6 @@ 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 ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 27 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 index dd0c456b61..f55cadba5d 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 @@ -3,7 +3,6 @@ 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 ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 27 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 index 9e9c457b3a..f8f68512f4 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 @@ -3,7 +3,6 @@ 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 ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 28 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 index 2df74f8ee1..b5db207950 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 @@ -3,7 +3,6 @@ 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 ARG GO_VERSION -ENV GO_VERSION $GO_VERSION ENV DISTRO fedora ENV SUITE 28 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local