-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
github-util: Update FROM version (#70)
* #1 Update version * Prepare for versioned release
- Loading branch information
Showing
2 changed files
with
34 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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="[email protected]" \ | ||
Version="3.8.3" | ||
Maintainer="[email protected]" \ | ||
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. | ||
|
||
|