mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #2420 from thaJeztah/golang_arg
Dockerfile: use GO_VERSION build-arg for overriding Go version
This commit is contained in:
commit
0acdd724ae
2 changed files with 4 additions and 2 deletions
|
@ -1,4 +1,6 @@
|
||||||
FROM golang:1.12.6 as dev
|
ARG GO_VERSION=1.12.6
|
||||||
|
|
||||||
|
FROM golang:${GO_VERSION} as dev
|
||||||
RUN apt-get update && apt-get -y install iptables \
|
RUN apt-get update && apt-get -y install iptables \
|
||||||
protobuf-compiler
|
protobuf-compiler
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ all-local: build-local check-local clean
|
||||||
# builder builds the libnetworkbuild container. All wrapper targets
|
# builder builds the libnetworkbuild container. All wrapper targets
|
||||||
# must depend on this to ensure that the container exists.
|
# must depend on this to ensure that the container exists.
|
||||||
builder:
|
builder:
|
||||||
docker build -t ${build_image} ${dockerbuildargs}
|
docker build -t ${build_image} --build-arg=GO_VERSION ${dockerbuildargs}
|
||||||
|
|
||||||
build: builder
|
build: builder
|
||||||
@echo "🐳 $@"
|
@echo "🐳 $@"
|
||||||
|
|
Loading…
Add table
Reference in a new issue