Catalog fix (#165)

* fix: add top level gomod for microservice build

* fix: modify makefile to handle building from root

Signed-off-by: Brian McGinn <[email protected]>

* feat: Add utilities to main

Signed-off-by: Brian McGinn <[email protected]>

* fix: Microservice build from root directory

Signed-off-by: Brian McGinn <[email protected]>

---------

Signed-off-by: Brian McGinn <[email protected]>

Makefile

@@ -98,9 +98,16 @@ install-go-lint:
 hadolint: 
 	docker run --rm -v $(pwd):/repo -i hadolint/hadolint:latest-alpine sh -c "cd /repo && hadolint -f json ./**/Dockerfile" > go-hadolint.json
 
-gobuild:
+gobuild-authentication:
 	cd ms-authentication && \
 	cp -r *.json .. && \
 	cp ./res/configuration.toml ../res/configuration.toml && \
 	CGO_ENABLED=1 GOOS=linux go build -ldflags='-s -w' -a -installsuffix cgo main.go && \
 	cp main ..
+
+gobuild-ledger:
+	cd ms-ledger && \
+	cp -r *.json .. && \
+	cp ./res/configuration.toml ../res/configuration.toml && \
+	CGO_ENABLED=1 GOOS=linux go build -ldflags='-s -w' -a -installsuffix cgo main.go && \
+	cp main ..

ds-cv-inference/Dockerfile

@@ -24,10 +24,9 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 RUN apt-get update && apt-get install libgtk2.0-dev libgtk-3-dev libjpeg62 -y
 WORKDIR /go/src/ds-cv-inference
 
-COPY go.* /go/src/ds-cv-inference/
-RUN go mod download
-
 COPY . /go/src/ds-cv-inference
+RUN go mod tidy
+RUN go mod download
 
 RUN /bin/bash -c "source /opt/intel/openvino/setupvars.sh && echo building ds-cv-inference... && go build -o ds-cv-inference" && \
       chmod +x entrypoint.sh

ms-authentication/Dockerfile

@@ -21,7 +21,7 @@ WORKDIR /usr/local/bin/ms-authentication/
 COPY . .
 
 # Compile the code
-RUN make gobuild
+RUN make gobuild-authentication
 
 # Next image - Copy built Go binary into new workspace
 FROM alpine

ms-authentication/Makefile

@@ -18,7 +18,7 @@ docker:
 		-t $(MICROSERVICE):dev \
 		.
 
-gobuild: tidy
+gobuild-authentication: tidy
 	CGO_ENABLED=1 GOOS=linux go build -ldflags='-s -w' -a -installsuffix cgo main.go
 
 run:

ms-ledger/Dockerfile

@@ -25,7 +25,7 @@ WORKDIR /usr/local/bin/ms-ledger/
 COPY . .
 
 # Compile the code
-RUN make gobuild
+RUN make gobuild-ledger
 
 # Next image - Copy built Go binary into new workspace
 FROM alpine

ms-ledger/Makefile

@@ -19,7 +19,7 @@ docker:
 		-t $(MICROSERVICE):dev \
 		.
 
-gobuild: tidy
+gobuild-ledger: tidy
 	CGO_ENABLED=1 GOOS=linux go build -ldflags='-s -w' -a -installsuffix cgo main.go
 
 run: