From acfddbce0955539f3e0bea4b39b8a0aebc7de641 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 14 Mar 2024 13:46:33 -0700 Subject: [PATCH] github-util: Update FROM version (#70) * #1 Update version * Prepare for versioned release --- CHANGELOG.md | 7 +++++++ Dockerfile | 54 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e08fb9..70700f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ 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.9.0] - 2024-03-14 + +### Changed in 3.9.0 + +- Updated Dockerfile FROM to `senzing/senzingapi-runtime:3.9.0` +- Updated to SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.9.0-24071" + ## [3.8.3] - 2024-03-14 ### Changed in 3.8.3 diff --git a/Dockerfile b/Dockerfile index faf4079..f4a1256 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG BASE_IMAGE=senzing/senzingapi-runtime:3.8.3 +ARG BASE_IMAGE=senzing/senzingapi-runtime:3.9.0 # Create the runtime image. ARG SENZING_ACCEPT_EULA="I_ACCEPT_THE_SENZING_EULA" -ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.8.3-24043" +ARG SENZING_APT_INSTALL_TOOLS_PACKAGE="senzingapi-tools=3.9.0-24071" # ----------------------------------------------------------------------------- # Stage: builder @@ -20,13 +20,13 @@ USER root # Install packages via apt. RUN apt update \ - && apt -y install \ - python3 \ - python3-dev \ - python3-pip \ - python3-venv \ - && apt clean \ - && rm -rf /var/lib/apt/lists/* + && apt -y install \ + python3 \ + python3-dev \ + python3-pip \ + python3-venv \ + && apt clean \ + && rm -rf /var/lib/apt/lists/* # Create and activate virtual environment. RUN python3 -m venv /app/venv @@ -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 @@ -54,11 +54,11 @@ 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/senzingapi-tools" \ - Maintainer="support@senzing.com" \ - Version="3.8.3" + Maintainer="support@senzing.com" \ + Version="3.9.0" # Run as "root" for system installation. @@ -71,15 +71,15 @@ 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} # Install packages via apt. RUN apt-get update \ - && apt-get -y install \ - python3-psycopg2 \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* + && apt-get -y install \ + python3-psycopg2 \ + python3-venv \ + && rm -rf /var/lib/apt/lists/* # Copy python virtual environment from the builder image. @@ -93,13 +93,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.