Bump senzing-factory/build-resources from 1 to 2

.github/linters/.checkov.yaml

@@ -0,0 +1,2 @@
+quiet: true
+skip-check: CKV_DOCKER_7

.github/workflows/add-labels-standardized.yaml

@@ -14,4 +14,4 @@ jobs:
     secrets:
       ORG_MEMBERSHIP_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }}
       SENZING_MEMBERS: ${{ secrets.SENZING_MEMBERS }}
-    uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v2

.github/workflows/add-to-project-garage-dependabot.yaml

@@ -11,6 +11,6 @@ jobs:
   add-to-project-dependabot:
     secrets:
       SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
-    uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v2
     with:
       project: ${{ vars.SENZING_PROJECT_GARAGE }}

.github/workflows/add-to-project-garage.yaml

@@ -13,7 +13,7 @@ jobs:
   add-to-project:
     secrets:
       SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
-    uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v2
     with:
       classic: false
       project-number: ${{ vars.SENZING_PROJECT_GARAGE }}

.github/workflows/dependabot-approve-and-merge.yaml

@@ -4,11 +4,12 @@ on:
   pull_request:
     branches: [main]
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   dependabot-approve-and-merge:
-    permissions:
-      contents: write
-      pull-requests: write
     secrets:
       SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }}
-    uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@v2

.github/workflows/docker-build-container.yaml

@@ -6,6 +6,9 @@ on:
       - main
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   docker-build-container-amd:
     runs-on: ubuntu-latest

.github/workflows/docker-push-containers-to-dockerhub.yaml

@@ -5,6 +5,9 @@ on:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
 
+permissions:
+  contents: read
+
 jobs:
   docker-push-containers-to-dockerhub-amd:
     runs-on: ubuntu-latest

.github/workflows/gofmt.yaml

@@ -9,4 +9,4 @@ permissions:
 
 jobs:
   gofmt:
-    uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@v2

.github/workflows/lint-workflows.yaml

@@ -14,4 +14,4 @@ permissions:
 
 jobs:
   lint-workflows:
-    uses: senzing-factory/build-resources/.github/workflows/lint-workflows.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/lint-workflows.yaml@v2

.github/workflows/make-go-github-file.yaml

@@ -15,4 +15,4 @@ jobs:
       SENZING_GITHUB_ACTOR: ${{ secrets.SENZING_GITHUB_ACTOR }}
       SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
       SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }}
-    uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@v2

.github/workflows/move-pr-to-done-dependabot.yaml

@@ -12,6 +12,6 @@ jobs:
   move-pr-to-done-dependabot:
     secrets:
       SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
-    uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done-dependabot.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done-dependabot.yaml@v2
     with:
       project: ${{ vars.SENZING_PROJECT_GARAGE }}

Dockerfile

@@ -18,8 +18,8 @@ FROM ${IMAGE_FINAL} as senzingapi_runtime
 FROM ${IMAGE_GO_BUILDER} as go_builder
 ENV REFRESHED_AT=2024-03-18
 LABEL Name="senzing/senzing-tools-builder" \
-      Maintainer="support@senzing.com" \
-      Version="0.6.3"
+  Maintainer="support@senzing.com" \
+  Version="0.6.3"
 
 # Copy local files from the Git repository.
 
@@ -43,7 +43,7 @@ RUN make build
 # Copy binaries to /output.
 
 RUN mkdir -p /output \
- && cp -R ${GOPATH}/src/senzing-tools/target/*  /output/
+  && cp -R ${GOPATH}/src/senzing-tools/target/*  /output/
 
 # -----------------------------------------------------------------------------
 # Stage: final
@@ -52,13 +52,15 @@ RUN mkdir -p /output \
 FROM ${IMAGE_FINAL} as final
 ENV REFRESHED_AT=2024-03-18
 LABEL Name="senzing/senzing-tools" \
-      Maintainer="support@senzing.com" \
-      Version="0.6.3"
+  Maintainer="support@senzing.com" \
+  Version="0.6.3"
 
 # Copy local files from the Git repository.
 
 COPY ./rootfs /
 
+HEALTHCHECK CMD ["/healthcheck.sh"]
+
 # Copy files from prior stage.
 
 COPY --from=go_builder "/output/linux/senzing-tools" "/app/senzing-tools"
@@ -67,33 +69,35 @@ COPY --from=go_builder "/output/linux/senzing-tools" "/app/senzing-tools"
 
 COPY --from=senzing/senzing-poc-server:3.5.1     "/app/senzing-poc-server.jar" "/app/senzing-poc-server.jar"
 
-# Install packages via apt.
+# Install packages via apt-get.
 
 RUN export STAT_TMP=$(stat --format=%a /tmp) \
- && chmod 777 /tmp \
- && apt update \
- && apt -y install \
-      gnupg2 \
-      jq \
-      libodbc1 \
-      postgresql-client \
-      unixodbc \
- && chmod ${STAT_TMP} /tmp \
- && rm -rf /var/lib/apt/lists/*
+  && chmod 777 /tmp \
+  && apt-get update \
+  && apt-get -y install \
+  gnupg2 \
+  jq \
+  libodbc1 \
+  postgresql-client \
+  unixodbc \
+  && chmod ${STAT_TMP} /tmp \
+  && rm -rf /var/lib/apt/lists/*
 
 # Install Java-11.
 
 RUN mkdir -p /etc/apt/keyrings \
- && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/keyrings/adoptium.asc
+  && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public > /etc/apt/keyrings/adoptium.asc
 
 RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" >> /etc/apt/sources.list
 
 RUN export STAT_TMP=$(stat --format=%a /tmp) \
- && chmod 777 /tmp \
- && apt update \
- && apt -y install temurin-11-jdk \
- && chmod ${STAT_TMP} /tmp \
- && rm -rf /var/lib/apt/lists/*
+  && chmod 777 /tmp \
+  && apt-get update \
+  && apt-get -y install temurin-11-jdk \
+  && chmod ${STAT_TMP} /tmp \
+  && rm -rf /var/lib/apt/lists/*
+
+USER 1001
 
 # Runtime environment variables.
 

package.Dockerfile

@@ -20,8 +20,8 @@ FROM ${IMAGE_SENZINGAPI_RUNTIME} as senzingapi_runtime
 FROM ${IMAGE_GO_BUILDER} as go_builder
 ENV REFRESHED_AT=2023-08-01
 LABEL Name="senzing/senzing-tools-builder" \
-      Maintainer="support@senzing.com" \
-      Version="0.6.0"
+  Maintainer="support@senzing.com" \
+  Version="0.6.0"
 
 # Build arguments.
 
@@ -35,6 +35,8 @@ ARG GO_PACKAGE_NAME="unknown"
 COPY ./rootfs /
 COPY . ${GOPATH}/src/${GO_PACKAGE_NAME}
 
+HEALTHCHECK CMD ["/healthcheck.sh"]
+
 # Copy files from prior stage.
 
 COPY --from=senzingapi_runtime  "/opt/senzing/g2/lib/"   "/opt/senzing/g2/lib/"
@@ -48,7 +50,7 @@ RUN make linux/amd64
 # Copy binaries to /output.
 
 RUN mkdir -p /output \
- && cp -R ${GOPATH}/src/${GO_PACKAGE_NAME}/target/*  /output/
+  && cp -R ${GOPATH}/src/${GO_PACKAGE_NAME}/target/*  /output/
 
 # -----------------------------------------------------------------------------
 # Stage: fpm_builder
@@ -59,8 +61,8 @@ RUN mkdir -p /output \
 FROM ${IMAGE_FPM_BUILDER} as fpm_builder
 ENV REFRESHED_AT=2023-08-01
 LABEL Name="senzing/senzing-tools-fpm-builder" \
-      Maintainer="support@senzing.com" \
-      Version="0.6.0"
+  Maintainer="support@senzing.com" \
+  Version="0.6.0"
 
 # Use arguments from prior stage.
 
@@ -76,25 +78,25 @@ COPY --from=go_builder "/output/linux-amd64/*"    "/output/linux-amd64/"
 # Create Linux RPM package.
 
 RUN fpm \
-      --input-type dir \
-      --output-type rpm \
-      --name ${PROGRAM_NAME} \
-      --package /output/${PROGRAM_NAME}-${BUILD_VERSION}.rpm \
-      --version ${BUILD_VERSION} \
-      --iteration ${BUILD_ITERATION} \
-      /output/linux-amd64/=/usr/bin
+  --input-type dir \
+  --output-type rpm \
+  --name ${PROGRAM_NAME} \
+  --package /output/${PROGRAM_NAME}-${BUILD_VERSION}.rpm \
+  --version ${BUILD_VERSION} \
+  --iteration ${BUILD_ITERATION} \
+  /output/linux-amd64/=/usr/bin
 
 # Create Linux DEB package.
 
 RUN fpm \
-      --deb-no-default-config-files \
-      --input-type dir \
-      --iteration ${BUILD_ITERATION} \
-      --name ${PROGRAM_NAME} \
-      --output-type deb \
-      --package /output/${PROGRAM_NAME}-${BUILD_VERSION}.deb \
-      --version ${BUILD_VERSION} \
-      /output/linux-amd64/=/usr/bin
+  --deb-no-default-config-files \
+  --input-type dir \
+  --iteration ${BUILD_ITERATION} \
+  --name ${PROGRAM_NAME} \
+  --output-type deb \
+  --package /output/${PROGRAM_NAME}-${BUILD_VERSION}.deb \
+  --version ${BUILD_VERSION} \
+  /output/linux-amd64/=/usr/bin
 
 # -----------------------------------------------------------------------------
 # Stage: final
@@ -103,8 +105,8 @@ RUN fpm \
 FROM ${IMAGE_FINAL} as final
 ENV REFRESHED_AT=2023-08-01
 LABEL Name="senzing/senzing-tools" \
-      Maintainer="support@senzing.com" \
-      Version="0.6.0"
+  Maintainer="support@senzing.com" \
+  Version="0.6.0"
 
 # Use arguments from prior stage.
 
@@ -114,5 +116,6 @@ ARG PROGRAM_NAME
 
 COPY --from=fpm_builder "/output/*"                                  "/output/"
 COPY --from=fpm_builder "/output/linux-amd64/${PROGRAM_NAME}"        "/output/linux-amd64/${PROGRAM_NAME}"
+USER 1001
 
 CMD ["/bin/bash"]

rootfs/healthcheck.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Return codes.
+
+OK=0
+NOT_OK=1
+
+# Tests.
+
+echo "Doing healthtest."
+
+exit ${OK}