[VOL-3704] Injection of build-parameters is not working anymore
Change-Id: Idec695f5e2c21156534af7078752c23750b4946f
(cherry picked from commit 6e846d1211d55c24fa787c7340d373729586a3f9)
diff --git a/Makefile b/Makefile
index 71ed349..89c76d7 100644
--- a/Makefile
+++ b/Makefile
@@ -85,17 +85,17 @@
local-protos:
ifdef LOCAL_PROTOS
- rm -rf vendor/github.com/opencord/voltha-protos/v3/go
- mkdir -p vendor/github.com/opencord/voltha-protos/v3/go
- cp -r ${LOCAL_PROTOS}/go/* vendor/github.com/opencord/voltha-protos/v3/go
- rm -rf vendor/github.com/opencord/voltha-protos/v3/go/vendor
+ rm -rf vendor/github.com/opencord/voltha-protos/v4/go
+ mkdir -p vendor/github.com/opencord/voltha-protos/v4/go
+ cp -r ${LOCAL_PROTOS}/go/* vendor/github.com/opencord/voltha-protos/v4/go
+ rm -rf vendor/github.com/opencord/voltha-protos/v4/go/vendor
endif
## Local Development Helpers
local-lib-go:
ifdef LOCAL_LIB_GO
- mkdir -p vendor/github.com/opencord/voltha-lib-go/v3/pkg
- cp -r ${LOCAL_LIB_GO}/pkg/* vendor/github.com/opencord/voltha-lib-go/v3/pkg/
+ mkdir -p vendor/github.com/opencord/voltha-lib-go/v4/pkg
+ cp -r ${LOCAL_LIB_GO}/pkg/* vendor/github.com/opencord/voltha-lib-go/v4/pkg/
endif
## Docker targets
diff --git a/VERSION b/VERSION
index c34958a..0eb956a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.15
+0.1.16-dev150
\ No newline at end of file
diff --git a/docker/Dockerfile.openonu b/docker/Dockerfile.openonu
index 7aa3f0a..ccb2552 100644
--- a/docker/Dockerfile.openonu
+++ b/docker/Dockerfile.openonu
@@ -37,13 +37,13 @@
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
RUN go build -mod=vendor -o /go/bin/openonu \
-ldflags \
- "-X github.com/opencord/voltha-lib-go/v3/pkg/version.version=$org_label_schema_version \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.vcsRef=$org_label_schema_vcs_ref \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.vcsDirty=$org_opencord_vcs_dirty \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.goVersion=$(go version 2>&1 | sed -E 's/.*go([0-9]+\.[0-9]+\.[0-9]+).*/\1/g') \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.os=$(go env GOHOSTOS) \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.arch=$(go env GOHOSTARCH) \
- -X github.com/opencord/voltha-lib-go/v3/pkg/version.buildTime=$org_label_schema_build_date" \
+ "-X github.com/opencord/voltha-lib-go/v4/pkg/version.version=$org_label_schema_version \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.vcsRef=$org_label_schema_vcs_ref \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.vcsDirty=$org_opencord_vcs_dirty \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.goVersion=$(go version 2>&1 | sed -E 's/.*go([0-9]+\.[0-9]+\.[0-9]+).*/\1/g') \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.os=$(go env GOHOSTOS) \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.arch=$(go env GOHOSTARCH) \
+ -X github.com/opencord/voltha-lib-go/v4/pkg/version.buildTime=$org_label_schema_build_date" \
./cmd/openonu-adapter/
# -------------