Skip to content

Commit

Permalink
#3 Add warning (#4)
Browse files Browse the repository at this point in the history
* #3 Add warning

* #3 Update docker image
  • Loading branch information
docktermj authored Dec 6, 2024
1 parent 8d8ac43 commit dd6890d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 31 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ and this project adheres to [Semantic Versioning].

## [Unreleased]

## [1.0.0] - 2024-11-19
## [0.1.24340] - 2024-12-06

### Added to 1.0.0
### Changed in 0.1.24340

- Initial
- `senzingsdk-tools=4.0.0-24340`

[Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
[markdownlint]: https://dlaa.me/markdownlint/
Expand Down
56 changes: 28 additions & 28 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG BASE_IMAGE=senzing/senzingsdk-runtime:4.0.0
ARG BASE_IMAGE=senzing/senzingsdk-runtime:0.1.24340

# Create the runtime image.

ARG SENZING_ACCEPT_EULA="I_ACCEPT_THE_SENZING_EULA"
ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingsdk-tools=4.0.0-24323"
ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingsdk-tools=4.0.0-24340"

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

FROM ${BASE_IMAGE} AS builder

ENV REFRESHED_AT=2024-09-26
ENV REFRESHED_AT=2024-12-06

# Run as "root" for system installation.

Expand All @@ -20,13 +20,13 @@ USER root
# Install packages via apt-get.

RUN apt-get update \
&& apt-get -y install \
python3 \
python3-dev \
python3-pip \
python3-venv \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
python3 \
python3-dev \
python3-pip \
python3-venv \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Create and activate virtual environment.
RUN python3 -m venv /app/venv
Expand All @@ -36,9 +36,9 @@ ENV PATH="/app/venv/bin:$PATH"

COPY requirements.txt .
RUN pip3 install --upgrade pip \
&& pip3 install -r requirements.txt \
&& rm requirements.txt \
&& pip3 uninstall -y setuptools pip
&& pip3 install -r requirements.txt \
&& rm requirements.txt \
&& pip3 uninstall -y setuptools pip

# -----------------------------------------------------------------------------
# Stage: Final
Expand All @@ -48,17 +48,17 @@ RUN pip3 install --upgrade pip \

FROM ${BASE_IMAGE} AS runner

ENV REFRESHED_AT=2024-09-26
ENV REFRESHED_AT=2024-12-06

ARG SENZING_ACCEPT_EULA
ARG SENZING_APT_INSTALL_TOOLS_PACKAGE

ENV SENZING_ACCEPT_EULA=${SENZING_ACCEPT_EULA} \
SENZING_APT_INSTALL_TOOLS_PACKAGE=${SENZING_APT_INSTALL_TOOLS_PACKAGE}
SENZING_APT_INSTALL_TOOLS_PACKAGE=${SENZING_APT_INSTALL_TOOLS_PACKAGE}

LABEL Name="senzing/senzingsdk-tools" \
Maintainer="[email protected]" \
Version="4.0.0"
Maintainer="[email protected]" \
Version="4.0.0"

# Run as "root" for system installation.

Expand All @@ -71,16 +71,16 @@ ENV TERM=xterm
# Install Senzing package.

RUN apt-get update \
&& apt-get -y install ${SENZING_APT_INSTALL_TOOLS_PACKAGE}
&& apt-get -y install ${SENZING_APT_INSTALL_TOOLS_PACKAGE}

HEALTHCHECK CMD apt list --installed | grep senzingsdk-tools

# Install packages via apt.

RUN apt-get update \
&& apt-get -y install \
python3-venv \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
python3-venv \
&& rm -rf /var/lib/apt/lists/*

# Copy python virtual environment from the builder image.

Expand All @@ -96,13 +96,13 @@ ENV PATH="/app/venv/bin:${PATH}"
# Set environment variables for root.

ENV LANGUAGE=C \
LC_ALL=C.UTF-8 \
LD_LIBRARY_PATH=/opt/senzing/g2/lib \
PATH=${PATH}:/opt/senzing/g2/python \
PYTHONPATH=/opt/senzing/g2/python:/opt/senzing/g2/sdk/python \
PYTHONUNBUFFERED=1 \
SENZING_DOCKER_LAUNCHED=true \
SENZING_SKIP_DATABASE_PERFORMANCE_TEST=true
LC_ALL=C.UTF-8 \
LD_LIBRARY_PATH=/opt/senzing/g2/lib \
PATH=${PATH}:/opt/senzing/g2/python \
PYTHONPATH=/opt/senzing/g2/python:/opt/senzing/g2/sdk/python \
PYTHONUNBUFFERED=1 \
SENZING_DOCKER_LAUNCHED=true \
SENZING_SKIP_DATABASE_PERFORMANCE_TEST=true

# Runtime execution.

Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# senzingsdk-tools

## :warning: Warning

This repository is specifically for Senzing SDK V4.
It is not designed to work with Senzing API V3.

To find the Senzing API V3 version of this repository, visit [senzingapi-tools].

## Synopsis

A Docker image with Senzingsdk library and Senzing tools installed.
Expand Down Expand Up @@ -37,3 +44,4 @@ any use of this image complies with any relevant licenses for all software conta
[license information]: https://senzing.com/end-user-license-agreement/
[Senzing GitHub community]: https://github.com/Senzing/
[senzing/senzingsdk-tools]: https://hub.docker.com/r/senzing/senzingsdk-tools
[senzingapi-tools]: https://github.com/Senzing/senzingapi-tools

0 comments on commit dd6890d

Please sign in to comment.