Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
File renamed without changes.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
version: 2
updates:
- package-ecosystem: github-actions
cooldown:
default-days: 21
directory: /
schedule:
interval: daily
- package-ecosystem: "maven"
cooldown:
default-days: 21
directory: "/"
schedule:
interval: "daily"
1 change: 1 addition & 0 deletions .github/linters/.checkov.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
quiet: true
skip-check:
- CKV_DOCKER_7
- CKV_SECRET_4
11 changes: 11 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"enabledManagers": ["dockerfile", "docker-compose"],
"extends": [
"config:recommended",
":disableDependencyDashboard",
"docker:pinDigests"
],
"schedule": ["on sunday"],
"minimumReleaseAge": "21 days"
}
13 changes: 13 additions & 0 deletions .github/workflows/verify-dockerfile-refreshed-at-updated.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Verify Dockerfile REFRESHED_AT Updated

on:
pull_request:

permissions: {}

jobs:
verify-dockerfiles:
name: Verify Dockerfiles REFRESHED_AT Updated
permissions:
contents: read
uses: senzing-factory/build-resources/.github/workflows/verify-dockerfile-refreshed-at-updated.yaml@v3
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ target/*
# Visual Studio code
.vscode/*
!.vscode/cspell.json
!.vscode/settings.json
*.code-workspace
.history

65 changes: 29 additions & 36 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"armeria",
"Bandley",
"BUILDOUT",
"Bandley",
"CCLA",
"CFCALL",
"CFRTN",
Expand All @@ -16,96 +15,90 @@
"CONFIGCHKSUM",
"CONFIGFILE",
"CONFIGMGR",
"cooldown",
"ctxt",
"datamart",
"dearmor",
"DFCALL",
"DFUNC",
"DISQUAL",
"DONT",
"DSRC",
"DSRCID",
"DYLD",
"Disqualifier",
"Djacoco",
"dockerfiles",
"DONT",
"Dorg",
"Dsenzing",
"Dskip",
"DSRC",
"DSRCID",
"Dsrcs",
"Dtest",
"DYLD",
"dylib",
"EFBOM",
"EFCALL",
"EFEATS",
"EFUNC",
"elete",
"ERFRAG",
"ERRULE",
"esbenp",
"FBOVR",
"FCLASS",
"felem",
"FELEMS",
"findsecbugs",
"ftype",
"GNRNP",
"GPLAN",
"hange",
"HMAC",
"ICLA",
"ignorefile",
"initialise",
"itali",
"Jacoco",
"javadocs",
"LIBFEAT",
"libsqlite3",
"linecorp",
"locklist",
"madrapps",
"Osmond",
"PARAMSTORE",
"PKCS",
"Pcheckstyle",
"peaceiris",
"Pjacoco",
"PKCS",
"Pspotbugs",
"rawtypes",
"RCLASS",
"RECOGNISED",
"reinit",
"Retryable",
"rootfs",
"RTYPE",
"Retryable",
"SCORESET",
"SENZ",
"Senzing",
"senzingsdk",
"Sepulveda",
"SFCALL",
"SFUNC",
"SOPIN",
"spotbugs",
"stackoverflow",
"SZCONFIGMGR",
"SZDIAGNOSTIC",
"SZHASHER",
"SZSS",
"Senzing",
"Sepulveda",
"temurin",
"Uninitializes",
"unresolve",
"USERPROFILE",
"UTYPE",
"Uninitializes",
"WATCHLIST",
"XLITERATOR",
"apidocs",
"armeria",
"ctxt",
"dylib",
"elete",
"esbenp",
"felem",
"findsecbugs",
"ftype",
"hange",
"ignorefile",
"initialise",
"itali",
"javadocs",
"linecorp",
"locklist",
"madrapps",
"peaceiris",
"rawtypes",
"reinit",
"senzingsdk",
"spotbugs",
"stackoverflow",
"temurin",
"unresolve"
"XLITERATOR"
],
"ignorePaths": [
".git/**",
Expand Down
12 changes: 12 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.formatOnSave": true
}
77 changes: 39 additions & 38 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ ARG IMAGE_FINAL=senzing/senzingsdk-runtime:4.1.0@sha256:e57d751dc0148bb8eeafedb7
FROM ${IMAGE_FINAL} AS senzingsdk_runtime

RUN apt-get update \
&& apt-get -y --no-install-recommends install \
senzingsdk-setup
&& apt-get -y --no-install-recommends install \
senzingsdk-setup

# -----------------------------------------------------------------------------
# Stage: builder
# -----------------------------------------------------------------------------
FROM ${IMAGE_BUILDER} AS builder
ENV REFRESHED_AT=2025-12-02
ENV REFRESHED_AT=2025-12-15
LABEL Name="senzing/java-builder" \
Maintainer="support@senzing.com" \
Version="0.1.0"
Maintainer="support@senzing.com" \
Version="0.3.0"

# Run as "root" for system installation.

Expand All @@ -37,29 +37,29 @@ COPY --from=senzingsdk_runtime "/etc/opt/senzing/" "/etc/opt/senzing/"
# Install packages via apt-get.

RUN apt-get update \
&& apt-get -y --no-install-recommends install \
libsqlite3-dev \
apt-transport-https \
gnupg2 \
gpg \
wget \
&& apt-get install -y --reinstall ca-certificates \
&& update-ca-certificates \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y --no-install-recommends install \
libsqlite3-dev \
apt-transport-https \
gnupg2 \
gpg \
wget \
&& apt-get install -y --reinstall ca-certificates \
&& update-ca-certificates \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install Java-17.

RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null \
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list

RUN apt-get update \
&& apt-get install -y --no-install-recommends temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*

RUN wget https://downloads.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz -P /opt \
&& tar xf /opt/apache-maven-*.tar.gz -C /opt \
&& ln -s /opt/apache-maven-3.9.11 /opt/maven
&& tar xf /opt/apache-maven-*.tar.gz -C /opt \
&& ln -s /opt/apache-maven-3.9.11 /opt/maven

ENV M2_HOME=/opt/maven
ENV MAVEN_HOME=/opt/maven
Expand Down Expand Up @@ -89,36 +89,37 @@ RUN mvn -ntp -DskipTests=true package
# -----------------------------------------------------------------------------

FROM ${IMAGE_FINAL} AS final
ENV REFRESHED_AT=2024-02-2025
ENV REFRESHED_AT=2025-12-15
LABEL Name="senzing/sz-sdk-grpc-java" \
Maintainer="support@senzing.com" \
Version="0.9.1"
Maintainer="support@senzing.com" \
Version="0.3.0"
#HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD ["/app/healthcheck.sh"]
HEALTHCHECK CMD ["echo hello"]
USER root

# Install packages via apt-get.

RUN apt-get update \
&& apt-get -y --no-install-recommends install \
senzingsdk-setup \
libsqlite3-dev \
apt-transport-https \
gnupg2 \
gpg \
wget \
&& apt-get install -y --reinstall ca-certificates \
&& update-ca-certificates \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y --no-install-recommends install \
senzingsdk-setup \
libsqlite3-dev \
apt-transport-https \
gnupg2 \
gpg \
wget \
&& apt-get install -y --reinstall ca-certificates \
&& update-ca-certificates \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install Java-17.

RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null \
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list

RUN apt-get update \
&& apt-get install -y --no-install-recommends temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*

# Copy files from repository.

Expand All @@ -135,7 +136,7 @@ USER 1001
# Runtime environment variables.
ENV SENZING_PATH=/opt/senzing
ENV LD_LIBRARY_PATH=/opt/senzing/er/lib/
ENV SENZING_TOOLS_DATABASE_URL=sqlite3://na:na@nowhere/IN_MEMORY_DB?mode=memory&cache=shared
ENV SENZING_TOOLS_CORE_DATABASE_URI=sqlite3:///tmp/senzing-repo.db

# Runtime execution.

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.linecorp.armeria</groupId>
<artifactId>armeria-bom</artifactId>
<version>1.34.0</version>
<version>1.34.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -175,12 +175,12 @@
<dependency>
<groupId>com.senzing</groupId>
<artifactId>data-mart-replicator</artifactId>
<version>2.0.0-beta.1.1</version>
<version>2.0.0-beta.1.2</version>
</dependency>
<dependency>
<groupId>com.senzing</groupId>
<artifactId>senzing-commons</artifactId>
<version>4.0.0-beta.1.5</version>
<version>4.0.0-beta.1.6</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down
Loading
Loading