Skip to content

Commit

Permalink
Bump senzing-factory/build-resources from 1 to 2 (#26)
Browse files Browse the repository at this point in the history
* 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] <support@github.com>

* fix linting

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <109683132+kernelsam@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and kernelsam authored May 31, 2024
1 parent 2dbfd3a commit 8e4460d
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 20 deletions.
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": 2
}
7 changes: 4 additions & 3 deletions .github/workflows/add-labels-standardized.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ on:
- opened
- reopened

permissions:
issues: write

jobs:
add-issue-labels:
permissions:
issues: write
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
3 changes: 3 additions & 0 deletions .github/workflows/add-to-project-community-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ env:
CREATOR: ${{ github.event.pull_request.user.login }}
GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}

permissions:
repository-projects: write

jobs:
add-to-project-dependabot:
name: add issue to Senzing Community project
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/add-to-project-community.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- opened
- reopened

permissions:
repository-projects: write

jobs:
add-to-project:
name: add issue to project
Expand Down
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
5 changes: 4 additions & 1 deletion .github/workflows/move-pr-to-done-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ on:
branches: [main]
types: [closed]

permissions:
repository-projects: write

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.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done.yaml@v2
34 changes: 19 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ FROM ${BASE_IMAGE}
ENV REFRESHED_AT=2023-06-19

LABEL Name="senzing/elasticsearch" \
Maintainer="support@senzing.com" \
Version="1.1.0"
Maintainer="support@senzing.com" \
Version="1.1.0"

# Run as "root" for system installation.

USER root
Expand All @@ -15,18 +15,22 @@ COPY elasticsearch /build
WORKDIR /build

RUN apt-get update \
&& apt-get -y install postgresql-client \
&& apt-get -y install openjdk-11-jre-headless maven \
&& apt-get -y clean \
&& ls \
&& mvn clean install \
&& mkdir /app \
&& cp target/g2elasticsearch-1.0.0-SNAPSHOT.jar /app/ \
&& cd / \
&& rm -rf /build \
&& apt-get -y remove maven \
&& apt-get -y autoremove \
&& apt-get -y clean
&& apt-get -y install postgresql-client \
&& apt-get -y install openjdk-11-jre-headless maven \
&& apt-get -y clean \
&& ls \
&& mvn clean install \
&& mkdir /app \
&& cp target/g2elasticsearch-1.0.0-SNAPSHOT.jar /app/ \
&& cd / \
&& rm -rf /build \
&& apt-get -y remove maven \
&& apt-get -y autoremove \
&& apt-get -y clean

HEALTHCHECK CMD test -f /app/g2elasticsearch-1.0.0-SNAPSHOT.jar

USER 1001

WORKDIR /app
CMD ["java", "-jar", "g2elasticsearch-1.0.0-SNAPSHOT.jar"]

0 comments on commit 8e4460d

Please sign in to comment.