Skip to content

Commit

Permalink
github-util: Update FROM version (#524)
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 7fa8f34 commit 7329d5c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 22 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ 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).

## [3.5.11] - 2024-05-22

### Changed in 3.5.11

- In `Dockerfile`, updated
- FROM instruction to `senzing/senzingapi-runtime:3.10.1`
- `senzing/base-image-debian:1.0.23`

## [3.5.10] - 2024-03-06

### Changed in 3.5.10
Expand Down
40 changes: 18 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
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

LABEL Name="senzing/senzing-api-server-builder" \
Maintainer="[email protected]" \
Version="3.5.10"
ENV REFRESHED_AT=2024-05-22

# Set environment variables.

Expand All @@ -26,8 +22,8 @@ COPY . /senzing-api-server
WORKDIR /senzing-api-server

RUN export SENZING_API_SERVER_VERSION=$(mvn "help:evaluate" -Dexpression=project.version -q -DforceStdout) \
&& make package \
&& cp /senzing-api-server/target/senzing-api-server-${SENZING_API_SERVER_VERSION}.jar "/senzing-api-server.jar"
&& make package \
&& cp /senzing-api-server/target/senzing-api-server-${SENZING_API_SERVER_VERSION}.jar "/senzing-api-server.jar"


# -----------------------------------------------------------------------------
Expand All @@ -36,11 +32,11 @@ RUN export SENZING_API_SERVER_VERSION=$(mvn "help:evaluate" -Dexpression=project

FROM ${BASE_IMAGE}

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

LABEL Name="senzing/senzing-api-server" \
Maintainer="[email protected]" \
Version="3.5.10"
Maintainer="[email protected]" \
Version="3.5.11"

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

Expand All @@ -51,24 +47,24 @@ USER root
# Install packages via apt.

RUN apt update \
&& apt -y install \
gnupg2 \
jq \
libodbc1 \
postgresql-client \
unixodbc \
&& rm -rf /var/lib/apt/lists/*
&& apt -y install \
gnupg2 \
jq \
libodbc1 \
postgresql-client \
unixodbc \
&& rm -rf /var/lib/apt/lists/*

# Install Java-11.

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-11-jdk \
&& rm -rf /var/lib/apt/lists/*
&& apt install -y temurin-11-jdk \
&& rm -rf /var/lib/apt/lists/*

# Copy files from repository.

Expand Down

0 comments on commit 7329d5c

Please sign in to comment.