gcpviz: Fixed Dockerfile building and add helpful message. (#1361)

Co-authored-by: Andrew Gold <41129777+agold-rh@users.noreply.github.com>

tools/gcpviz/Dockerfile

@@ -13,28 +13,32 @@
 #   limitations under the License.
 #
 
-FROM golang:1.14 AS builder
+FROM golang:1.23 AS builder
 
 WORKDIR /go/src/github.com/GoogleCloudPlatform/professional-services/tools/gcpviz
 COPY go.mod go.sum *.go ./
+RUN mkdir -p cmd/gcpviz
 COPY cmd/gcpviz/*.go ./cmd/gcpviz
 RUN cd cmd/gcpviz
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o $GOPATH/bin ./...
 
 FROM google/cloud-sdk:slim
 
-RUN apt-get update
-RUN apt-get install -y graphviz
+RUN apt-get update && apt-get install -y graphviz
 
 WORKDIR /gcpviz
-COPY --from=builder /go/bin/cmd gcpviz
+COPY --from=builder /go/bin/gcpviz gcpviz
 COPY style.yaml relations.yaml labels.yaml ./
 COPY wait_for_export.sh gcpviz.sh ./
 COPY redactor.py requirements.txt ./
 COPY queries ./queries/
+
+# Install dependencies here, we only have one dependency which doesn't ship as deb
+# package for bookworm and other options are excessive:
+RUN rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
 RUN pip3 install -r requirements.txt
 
 RUN chmod +x wait_for_export.sh gcpviz.sh redactor.py
 
-ENV PATH "$PATH:/gcpviz"
+ENV PATH="$PATH:/gcpviz"
 

tools/gcpviz/gcpviz.sh

@@ -22,6 +22,8 @@ fi
 cd /gcpviz || exit 1
 if [ ! -f graph.db ] ; then
     ./gcpviz -resource-inventory-file cai/resource_inventory.json -mode generate
+else
+    echo "Not regenerating graph database as it exists (graph.db)"
 fi
 
 graph=$1