Fixing image build failure accounting service

Author: lukekraus45

src/accountingservice/Dockerfile

@@ -3,17 +3,31 @@
 
 
 FROM registry.ddbuild.io/images/mirror/golang:1.22-alpine AS builder
-WORKDIR /usr/src/app/
 
-COPY ./src/accountingservice/ ./
-RUN go build -o /go/bin/accountingservice/
+WORKDIR /usr/src/app
+
+RUN apk update \
+    && apk add --no-cache make protobuf-dev
+
+
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=bind,source=./src/accountingservice/go.sum,target=go.sum \
+    --mount=type=bind,source=./src/accountingservice/go.mod,target=go.mod \
+    --mount=type=bind,source=./src/accountingservice/tools.go,target=tools.go \
+    go mod download \
+    && go list -e -f '{{range .Imports}}{{.}} {{end}}' tools.go | CGO_ENABLED=0 xargs go install -mod=readonly
 
-# -----------------------------------------------------------------------------
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=bind,rw,source=./src/accountingservice,target=. \
+    --mount=type=bind,rw,source=./pb,target=./pb \
+    protoc -I ./pb ./pb/demo.proto --go_out=./ --go-grpc_out=./ \
+    && go build -ldflags "-s -w" -o /go/bin/accountingservice/ ./ 
 
 FROM alpine
 
 WORKDIR /usr/src/app/
 
 COPY --from=builder /go/bin/accountingservice/ ./
 
-ENTRYPOINT [ "./accountingservice" ]
+ENTRYPOINT [ "./accountingservice" ]

src/accountingservice/go.mod

@@ -9,9 +9,9 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
 	go.opentelemetry.io/otel/sdk v1.27.0
 	go.opentelemetry.io/otel/trace v1.27.0
-	google.golang.org/grpc v1.64.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
 	google.golang.org/protobuf v1.34.1
+
 )
 
 require (
@@ -22,7 +22,6 @@ require (
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -45,4 +44,5 @@ require (
 	golang.org/x/text v0.15.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
-)
+	google.golang.org/grpc v1.64.0 // indirect
+)

src/accountingservice/kafka/consumer.go

@@ -4,6 +4,7 @@ package kafka
 
 import (
 	"context"
+
 	pb "github.com/open-telemetry/opentelemetry-demo/src/accountingservice/genproto/oteldemo"
 
 	"github.com/IBM/sarama"

src/productcatalogservice/Dockerfile

@@ -6,22 +6,10 @@ FROM registry.ddbuild.io/images/mirror/golang:1.22-alpine AS builder
 
 WORKDIR /usr/src/app/
 
-RUN apk update \
-    && apk add --no-cache make protobuf-dev
-
-RUN --mount=type=cache,target=/go/pkg/mod/ \
-    --mount=type=bind,source=./src/productcatalogservice/go.sum,target=go.sum \
-    --mount=type=bind,source=./src/productcatalogservice/go.mod,target=go.mod \
-    --mount=type=bind,source=./src/productcatalogservice/tools.go,target=tools.go \
-    go mod download \
-    && go list -e -f '{{range .Imports}}{{.}} {{end}}' tools.go | CGO_ENABLED=0 xargs go install -mod=readonly
-
-RUN --mount=type=cache,target=/go/pkg/mod/ \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,rw,source=./src/productcatalogservice,target=. \
-    --mount=type=bind,rw,source=./pb,target=./pb \
-    protoc -I ./pb ./pb/demo.proto --go_out=./ --go-grpc_out=./ \
-    && go build -ldflags "-s -w" -o /go/bin/productcatalogservice/ ./
+RUN apk add build-base protobuf-dev protoc
+
+COPY ./src/productcatalogservice/ ./
+RUN go build -o /go/bin/productcatalogservice/
 
 # -----------------------------------------------------------------------------
 
@@ -33,4 +21,4 @@ COPY ./src/productcatalogservice/products/ ./products/
 COPY --from=builder /go/bin/productcatalogservice/ ./
 
 EXPOSE ${PRODUCT_SERVICE_PORT}
-ENTRYPOINT [ "./productcatalogservice" ]
+ENTRYPOINT [ "./productcatalogservice" ]