VOL-1558 Implementation of openolt adapter with dep for dependency management
Also updated the build system to take this into account.
Currently dep ensure fails due to missing libraries in voltha-go, but the vendor folder has been updated otherwise.
This can be worked around in development using the LOCAL_VOLTHAGO variable described in the readme
This does not build currrently, but that is due to missing code in voltha-go master.
This pattern is consistent with how voltha-go does things, but does not leave you dependent on it to build.
See the readme for how to use dep.
The resourcemanager file is no longer hidden.
Change-Id: I25b8472dbc517b193970597c9f43ddff18c2d89f
diff --git a/docker/Dockerfile.openolt b/docker/Dockerfile.openolt
index c975591..ed20905 100644
--- a/docker/Dockerfile.openolt
+++ b/docker/Dockerfile.openolt
@@ -6,44 +6,22 @@
# Install required packages
RUN apk add --no-cache wget git make build-base protobuf protobuf-dev
-# Install protobuf requirements
-RUN git clone https://github.com/googleapis/googleapis.git /usr/local/include/googleapis
-RUN go get google.golang.org/genproto/googleapis/api/annotations
-
# Prepare directory structure
-RUN ["mkdir", "-p", "/src", "src/protos"]
+RUN ["mkdir", "-p", "/src"]
RUN ["mkdir", "-p", "$GOPATH/src", "$GOPATH/pkg", "$GOPATH/bin"]
RUN ["mkdir", "-p", "$GOPATH/src/github.com/opencord"]
-RUN ["mkdir", "-p", "$GOPATH/src/github.com/opencord/voltha-go"]
+RUN ["mkdir", "-p", "$GOPATH/src/github.com/opencord/voltha-openolt-adapter"]
-WORKDIR $GOPATH/src/github.com/opencord
+WORKDIR $GOPATH/src/github.com/opencord/voltha-openolt-adapter
-RUN git clone https://gerrit.opencord.org/voltha-go.git
-
-WORKDIR $GOPATH/src/github.com/opencord/voltha-go
-
-
-# Copy files
-ADD adaptercore ./adapters/openolt/adaptercore
-ADD config ./adapters/openolt/config
-ADD *.go ./adapters/openolt
-
-RUN ls ./adapters/openolt
-
-# Copy required proto files
-ADD openolt.proto ./protos
-
-# Install the protoc-gen-go
-RUN go install ./vendor/github.com/golang/protobuf/protoc-gen-go
-
-# Compile protobuf files
-RUN sh protos/scripts/build_protos.sh protos
-
-RUN protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor,plugins=grpc:$GOPATH/src -I protos -I /usr/local/include/googleapis protos/openolt.proto
+COPY adaptercore ./adaptercore
+COPY config ./config
+COPY vendor ./vendor
+COPY *.go ./
# Build openolt
+RUN go build -o /src/openolt
-RUN cd adapters/openolt && go build -o /src/openolt
# -------------
# Image creation stage