Moving BBSim entrypoint in the cmd folder, building bbsimctl in the container
Change-Id: I4823578ed17c40b13c1c9a561e7aa7e6640f7f19
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
index 2b1484e..46af0e3 100644
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -47,13 +47,7 @@
# copy and build
COPY . ./
RUN go mod vendor -v # we can't vendor dependencies unless the code is there
-ARG GIT_STATUS=Clean
-RUN GO111MODULE=on go build -mod vendor\
- -ldflags "-X main.buildTime=$(date +”%Y/%m/%d-%H:%M:%S”) \
- -X main.commitHash=$(git log --pretty=format:%H -n 1) \
- -X main.gitStatus=${GIT_STATUS}\
- -X main.version=$(cat VERSION)" \
- -o ./cmd/bbsim ./internal/bbsim
+RUN make build
# runtime parent
FROM golang:1.12-stretch
@@ -73,6 +67,8 @@
&& touch /var/lib/dhcp/dhcpd.leases
WORKDIR /app
-COPY --from=builder /go/src/github.com/opencord/bbsim/cmd/bbsim /app/bbsim
+COPY --from=builder /go/src/github.com/opencord/bbsim/bbsim /app/bbsim
+COPY --from=builder /go/src/github.com/opencord/bbsim/bbsimctl /usr/bin/bbsimctl
RUN chmod a+x /app/bbsim
+RUN chmod a+x /usr/bin/bbsimctl
CMD [ '/app/bbsim' ]
\ No newline at end of file