diff --git a/VERSION b/VERSION index 1ebd2fb6f..8bd6ba8c5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.4-dev +0.7.5 diff --git a/build/base/Dockerfile b/build/base/Dockerfile index f7089d9bd..e500a0373 100644 --- a/build/base/Dockerfile +++ b/build/base/Dockerfile @@ -1,6 +1,4 @@ -ARG ONOS_BUILD_VERSION=undefined - -FROM onosproject/golang-build:$ONOS_BUILD_VERSION +FROM onosproject/golang-build:v0.6.3 ENV GO111MODULE=on ARG ONOS_MAKE_TARGET=build diff --git a/build/onos-config/Dockerfile b/build/onos-config/Dockerfile index 7b3604ec0..dd193bf94 100644 --- a/build/onos-config/Dockerfile +++ b/build/onos-config/Dockerfile @@ -1,7 +1,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 onosproject/onos-config-base:v0.6.3 as base FROM alpine:3.11 RUN apk add libc6-compat diff --git a/go.mod b/go.mod index eb7214c5d..c9c42147d 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/onosproject/onos-config go 1.14 require ( + cloud.google.com/go v0.43.0 // indirect github.com/Pallinder/go-randomdata v1.2.0 github.com/atomix/go-client v0.4.1 github.com/cenkalti/backoff v2.2.1+incompatible @@ -10,10 +11,12 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/golang/mock v1.4.4 github.com/golang/protobuf v1.4.3 + github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect github.com/google/uuid v1.1.2 github.com/googleapis/gnostic v0.3.0 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 + github.com/kr/pty v1.1.8 // indirect github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/onosproject/config-models/modelplugin/devicesim-1.0.0 v0.0.0-20201130213019-492043aed0df @@ -33,6 +36,7 @@ require ( github.com/spf13/viper v1.6.2 // indirect github.com/stretchr/testify v1.5.1 go.uber.org/multierr v1.4.0 // indirect + golang.org/x/mobile v0.0.0-20190806162312-597adff16ade // indirect golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 // indirect google.golang.org/grpc v1.33.2 gopkg.in/yaml.v2 v2.2.8