diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 365d0ceecd..a090795dd4 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -5,7 +5,9 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev +GO_BASE_IMAGE=golang GO_VERSION:=1.10.3 +GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown RPMBUILD=docker run --privileged --rm -i\ @@ -48,7 +50,7 @@ centos: centos-7 ## build all centos rpm packages fedora-28: ## build fedora-28 rpm packages fedora-28: $(SOURCES) $(CHOWN) -R root:root rpmbuild - docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) . + docker build --build-arg GO_IMAGE=$(GO_IMAGE) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) . $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild @@ -56,7 +58,7 @@ fedora-28: $(SOURCES) fedora-27: ## build fedora-27 rpm packages fedora-27: $(SOURCES) $(CHOWN) -R root:root rpmbuild - docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) . + docker build --build-arg GO_IMAGE=$(GO_IMAGE) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) . $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild @@ -64,7 +66,7 @@ fedora-27: $(SOURCES) centos-7: ## build centos-7 rpm packages centos-7: $(SOURCES) $(CHOWN) -R root:root rpmbuild - docker build --build-arg GO_VERSION=$(GO_VERSION) -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) . + docker build --build-arg GO_IMAGE=$(GO_IMAGE) -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 6866f64cbb..0851a3ee9c 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.aarch64 +++ b/components/packaging/rpm/centos-7/Dockerfile.aarch64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM centos:7 ENV DISTRO centos diff --git a/components/packaging/rpm/centos-7/Dockerfile.x86_64 b/components/packaging/rpm/centos-7/Dockerfile.x86_64 index df150067cf..b6334f62dd 100644 --- a/components/packaging/rpm/centos-7/Dockerfile.x86_64 +++ b/components/packaging/rpm/centos-7/Dockerfile.x86_64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM centos:7 ENV DISTRO centos diff --git a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 index 0bdff95703..ee2f8b0860 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.aarch64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM fedora:27 ENV DISTRO fedora diff --git a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 index e1520d81b4..ee2f8b0860 100644 --- a/components/packaging/rpm/fedora-27/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-27/Dockerfile.x86_64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM fedora:27 ENV DISTRO fedora diff --git a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 index 9697dd1c5f..797422fa8f 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.aarch64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.aarch64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM fedora:28 ENV DISTRO fedora diff --git a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 index 542c576383..da23b74991 100644 --- a/components/packaging/rpm/fedora-28/Dockerfile.x86_64 +++ b/components/packaging/rpm/fedora-28/Dockerfile.x86_64 @@ -1,7 +1,5 @@ -FROM alpine:latest as golang -RUN apk add curl -ARG GO_VERSION -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local +ARG GO_IMAGE +FROM ${GO_IMAGE} as golang FROM fedora:28 ENV DISTRO fedora