Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/linters/.checkov.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
quiet: true
skip-check: CKV_DOCKER_7
3 changes: 3 additions & 0 deletions .github/linters/.jscpd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"threshold": 1
}
2 changes: 1 addition & 1 deletion .github/workflows/add-labels-standardized.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project-garage-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project-garage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/dependabot-approve-and-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/gofmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/lint-workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/make-go-github-file.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:

jobs:
make-go-github-file:
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
secrets:
SENZING_GITHUB_ACTOR: ${{ secrets.SENZING_GITHUB_ACTOR }}
SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/move-pr-to-done-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
48 changes: 26 additions & 22 deletions package.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ARG IMAGE_FINAL=alpine
FROM ${IMAGE_GO_BUILDER} as go_builder
ENV REFRESHED_AT=2023-08-01
LABEL Name="senzing/explain-builder" \
Maintainer="support@senzing.com" \
Version="0.2.0"
Maintainer="support@senzing.com" \
Version="0.2.0"

# Build arguments.

Expand All @@ -28,6 +28,8 @@ ARG GO_PACKAGE_NAME="unknown"
COPY ./rootfs /
COPY . ${GOPATH}/src/${GO_PACKAGE_NAME}

HEALTHCHECK CMD ["/healthcheck.sh"]

# Build go program.

WORKDIR ${GOPATH}/src/${GO_PACKAGE_NAME}
Expand All @@ -36,7 +38,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
Expand All @@ -47,8 +49,8 @@ RUN mkdir -p /output \
FROM ${IMAGE_FPM_BUILDER} as fpm_builder
ENV REFRESHED_AT=2023-08-01
LABEL Name="senzing/explain-fpm-builder" \
Maintainer="support@senzing.com" \
Version="0.2.0"
Maintainer="support@senzing.com" \
Version="0.2.0"

# Use arguments from prior stage.

Expand All @@ -64,25 +66,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
Expand All @@ -91,8 +93,8 @@ RUN fpm \
FROM ${IMAGE_FINAL} as final
ENV REFRESHED_AT=2023-08-01
LABEL Name="senzing/explain" \
Maintainer="support@senzing.com" \
Version="0.2.0"
Maintainer="support@senzing.com" \
Version="0.2.0"

# Use arguments from prior stage.

Expand All @@ -103,4 +105,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"]
12 changes: 12 additions & 0 deletions rootfs/healthcheck.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

# Return codes.

OK=0
NOT_OK=1

# Tests.

echo "Doing healthtest."

exit ${OK}