Skip to content
This repository was archived by the owner on Sep 18, 2024. It is now read-only.

Commit

Permalink
github-util: Update FROM version (#199)
Browse files Browse the repository at this point in the history
* #1 Update version

* prepare for versioned release
  • Loading branch information
kernelsam authored May 22, 2024
1 parent cdce2b7 commit 1d44037
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 17 deletions.
12 changes: 12 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,20 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
[markdownlint](https://dlaa.me/markdownlint/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.5.2] - 2024-05-22

### Changed in 0.5.2

- In `Dockerfile`, updated FROM instruction to `senzing/senzingapi-runtime:3.10.1`

## [0.5.1] - 2023-09-29

### Changed in 0.5.1
Expand Down
34 changes: 17 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG BASE_IMAGE=senzing/senzingapi-runtime:3.9.0
ARG BASE_BUILDER_IMAGE=senzing/base-image-debian:1.0.22
ARG BASE_IMAGE=senzing/senzingapi-runtime:3.10.1
ARG BASE_BUILDER_IMAGE=senzing/base-image-debian:1.0.23

# -----------------------------------------------------------------------------
# Stage: builder
# -----------------------------------------------------------------------------

FROM ${BASE_BUILDER_IMAGE} as builder

ENV REFRESHED_AT=2024-03-18
ENV REFRESHED_AT=2024-05-22

LABEL Name="senzing/connector-neo4j-builder" \
Maintainer="[email protected]" \
Version="0.5.1"
Maintainer="[email protected]" \
Version="0.5.2"

# Set environment variables.

Expand All @@ -22,35 +22,35 @@ ENV LD_LIBRARY_PATH=${SENZING_ROOT}/g2/lib:${SENZING_ROOT}/g2/lib/debian
# Install java-17
# This is a requirement for neo4j java client 5.0 and higher.
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 apt update \
&& apt install -y temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y temurin-17-jdk \
&& rm -rf /var/lib/apt/lists/*

# Build "connector-neo4j.jar"

COPY . /connector-neo4j
WORKDIR /connector-neo4j

RUN export CONNECTOR_NEO4J_JAR_VERSION=$(mvn "help:evaluate" -Dexpression=project.version -q -DforceStdout) \
&& make package \
&& cp /connector-neo4j/target/neo4j-connector-${CONNECTOR_NEO4J_JAR_VERSION}.jar "/neo4j-connector.jar" \
&& cp -r /connector-neo4j/target/libs "/libs"
&& make package \
&& cp /connector-neo4j/target/neo4j-connector-${CONNECTOR_NEO4J_JAR_VERSION}.jar "/neo4j-connector.jar" \
&& cp -r /connector-neo4j/target/libs "/libs"

# -----------------------------------------------------------------------------
# Stage: Final
# -----------------------------------------------------------------------------

FROM ${BASE_IMAGE}

ENV REFRESHED_AT=2024-03-18
ENV REFRESHED_AT=2024-05-22

LABEL Name="senzing/connector-neo4j" \
Maintainer="[email protected]" \
Version="0.5.1"
Maintainer="[email protected]" \
Version="0.5.2"

HEALTHCHECK CMD ["/app/healthcheck.sh"]

Expand All @@ -61,9 +61,9 @@ USER root
# Install packages via apt.

RUN apt-get update \
&& apt-get -y install \
software-properties-common \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
software-properties-common \
&& rm -rf /var/lib/apt/lists/*

# Service exposed on port 8080.

Expand Down

0 comments on commit 1d44037

Please sign in to comment.