Update build image to v0.5.0 and go 1.14 and alpine 3.11 (#1122)

onosproject · Apr 14, 2020 · 3cac3ff · 3cac3ff
1 parent 74c0e57
commit 3cac3ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,8 @@ export GO111MODULE=on
 .PHONY: build
 
 ONOS_CONFIG_VERSION := latest
-ONOS_BUILD_VERSION := stable
+ONOS_BUILD_VERSION := v0.5.0
+ONOS_PROTOC_VERSION := v0.5.0
 
 build: # @HELP build the Go binaries and run all validations (default)
 build:
@@ -39,7 +40,7 @@ protos: # @HELP compile the protobuf files (using protoc-go Docker)
 	docker run -it -v `pwd`:/go/src/github.com/onosproject/onos-config \
 		-w /go/src/github.com/onosproject/onos-config \
 		--entrypoint build/bin/compile-protos.sh \
-		onosproject/protoc-go:stable
+		onosproject/protoc-go:${ONOS_PROTOC_VERSION}
 
 onos-config-base-docker: # @HELP build onos-config base Docker image
 	@go mod vendor

diff --git a/build/base/Dockerfile b/build/base/Dockerfile
@@ -1,9 +1,7 @@
-ARG ONOS_BUILD_VERSION=v0.5.0
+ARG ONOS_BUILD_VERSION=undefined
 
 FROM onosproject/golang-build:$ONOS_BUILD_VERSION
 
-RUN go get -u github.com/go-delve/delve/cmd/dlv
-
 ENV GO111MODULE=on
 ARG ONOS_MAKE_TARGET=build
 

diff --git a/build/onos-config/Dockerfile b/build/onos-config/Dockerfile
@@ -3,7 +3,7 @@ ARG ONOS_CONFIG_BASE_VERSION=latest
 # The base image contains the onos-config binaries
 FROM onosproject/onos-config-base:$ONOS_CONFIG_BASE_VERSION as base
 
-FROM alpine:3.9
+FROM alpine:3.11
 RUN apk add libc6-compat
 
 USER nobody