Bump senzing-factory/build-resources from 1 to 2 (#262)

* Bump senzing-factory/build-resources from 1 to 2 Bumps [senzing-factory/build-resources](https://github.com/senzing-factory/build-resources) from 1 to 2. - [Release notes](https://github.com/senzing-factory/build-resources/releases) - [Changelog](https://github.com/senzing-factory/build-resources/blob/main/CHANGELOG.md) - [Commits](senzing-factory/build-resources@v1...v2) --- updated-dependencies: - dependency-name: senzing-factory/build-resources dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fix linting * Added OpenAPI exceptions --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam <[email protected]> Co-authored-by: Michael Dockter <[email protected]>
senzing-garage · Jun 28, 2024 · d7c3108 · d7c3108
1 parent eeba52c
commit d7c3108
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 11 deletions.
diff --git a/.github/linters/.checkov.yaml b/.github/linters/.checkov.yaml
@@ -0,0 +1,6 @@
+quiet: true
+skip-check:
+  - CKV_DOCKER_7
+  - CKV_OPENAPI_4
+  - CKV_OPENAPI_5
+  - CKV_OPENAPI_21
diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json
@@ -0,0 +1,3 @@
+{
+  "threshold": 8
+}
diff --git a/.github/workflows/add-labels-standardized.yaml b/.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
diff --git a/.github/workflows/add-to-project-app-server-dependabot.yaml b/.github/workflows/add-to-project-app-server-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_APP_SERVER }}
diff --git a/.github/workflows/add-to-project-app-server.yaml b/.github/workflows/add-to-project-app-server.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_APP_SERVER}}

diff --git a/.github/workflows/docker-build-container.yaml b/.github/workflows/docker-build-container.yaml
@@ -2,6 +2,9 @@ name: docker build container
 
 on: [push]
 
+permissions:
+  contents: read
+
 jobs:
   docker-build-container:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml b/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml
@@ -5,6 +5,9 @@ on:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
 
+permissions:
+  contents: read
+
 jobs:
   docker-push-containers-to-dockerhub-and-ecr:
     permissions:
@@ -14,7 +17,7 @@ jobs:
       AWS_DOCKER_ACCOUNT_ID: ${{ secrets.AWS_DOCKER_ACCOUNT_ID }}
       DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-    uses: senzing-factory/build-resources/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml@v1
+    uses: senzing-factory/build-resources/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml@v2
     with:
       build-options: "--push"
       docker-image-repository: senzing/senzing-poc-server

diff --git a/.github/workflows/lint-workflows.yaml b/.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
diff --git a/.github/workflows/move-pr-to-done-dependabot.yaml b/.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_APP_SERVER }}
diff --git a/Dockerfile b/Dockerfile
@@ -59,10 +59,10 @@ HEALTHCHECK CMD ["/app/healthcheck.sh"]
 
 USER root
 
-# Install packages via apt.
+# Install packages via apt-get.
 
-RUN apt update \
-  && apt -y install \
+RUN apt-get update \
+  && apt-get -y install \
   gnupg2 \
   jq \
   libodbc1 \
@@ -77,8 +77,8 @@ RUN mkdir -p /etc/apt/keyrings \
 
 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 apt update \
-  && apt install -y temurin-11-jdk \
+RUN apt-get update \
+  && apt-get install -y temurin-11-jdk \
   && rm -rf /var/lib/apt/lists/*
 
 # Copy files from repository.