toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to use a base golang image instead of curl

Browse Source 
Why didn't we do this the whole time? `¯\_(ツ)_/¯`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: df2a0d6fc5a59a7a8b352689238eddf5a46d3ed4
Component: packaging
This commit is contained in:
Eli Uriegas
2018-08-15 23:12:28 +00:00
parent 4a4db9a651
commit cbb6da8c29
7 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/packaging/rpm/Makefile
View File

@ -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

6
components/packaging/rpm/centos-7/Dockerfile.aarch64
View File

@ -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

6
components/packaging/rpm/centos-7/Dockerfile.x86_64
View File

@ -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

6
components/packaging/rpm/fedora-27/Dockerfile.aarch64
View File

@ -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

6
components/packaging/rpm/fedora-27/Dockerfile.x86_64
View File

@ -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

6
components/packaging/rpm/fedora-28/Dockerfile.aarch64
View File

@ -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

6
components/packaging/rpm/fedora-28/Dockerfile.x86_64
View File

@ -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