Changes to the build system to use a base container for the
affinity router data and control planes.
Change-Id: Iea7f6ad72c1a9e9d1e90753c7b5f482e6c638f28
diff --git a/docker/Dockerfile.arouter b/docker/Dockerfile.arouter
index be87905..b1769a1 100644
--- a/docker/Dockerfile.arouter
+++ b/docker/Dockerfile.arouter
@@ -1,35 +1,18 @@
# -------------
# Build stage
-FROM golang:1.10-alpine AS build-env
-
-
-# Install required packages
-RUN apk add --no-cache wget git make build-base protobuf protobuf-dev
-
-RUN git clone https://github.com/googleapis/googleapis.git /usr/local/include/googleapis
-
-# Prepare directory structure
-RUN ["mkdir", "-p", "/src", "src/protos"]
-RUN ["mkdir", "-p", "$GOPATH/src", "$GOPATH/pkg", "$GOPATH/bin"]
-RUN ["mkdir", "-p", "$GOPATH/src/github.com/opencord/voltha/protos/go"]
-
-# Install golang protobuf
-RUN go get github.com/golang/protobuf/protoc-gen-go
-RUN go get google.golang.org/genproto/googleapis/rpc/status
-RUN go get google.golang.org/grpc/binarylog/grpc_binarylog_v1
+FROM base AS build-env
# Copy files
ADD rw_core $GOPATH/src/github.com/opencord/voltha-go/rw_core
ADD common $GOPATH/src/github.com/opencord/voltha-go/common
ADD db $GOPATH/src/github.com/opencord/voltha-go/db
ADD kafka $GOPATH/src/github.com/opencord/voltha-go/kafka
-ADD vendor $GOPATH/src/github.com/opencord/voltha-go/vendor
ADD afrouter $GOPATH/src/github.com/opencord/voltha-go/afrouter
-
# Copy required proto files
# ... VOLTHA proos
+# Repeat here even if it's done in the base
ADD protos/*.proto /src/protos/
ADD protos/scripts/* /src/protos/
ADD afrouter/arouter.json /src
@@ -38,21 +21,13 @@
# Copy generated executables here
WORKDIR $GOPATH/src/github.com/opencord/voltha-go
-#RUN ls -ltrR /go/src/github.com/opencord/voltha-go
-
-# Install golang protobuf
-#RUN go get github.com/golang/protobuf/protoc-gen-go
-#RUN go get google.golang.org/genproto/googleapis/rpc/status
-#RUN go get google.golang.org/grpc/binarylog/grpc_binarylog_v1
-RUN go install ./vendor/github.com/golang/protobuf/protoc-gen-go
-
# Compile protobuf files
+# Repeat here even if it's done in the base
RUN sh /src/protos/build_protos.sh /src/protos
# Build rw_core
RUN cd afrouter && go build -o /src/afrouter
-
# -------------
# Image creation stage