Skip to content

Commit

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

* prepare for versioned release
  • Loading branch information
kernelsam authored Jun 25, 2024
1 parent e433cff commit fb6f222
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 61 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [1.4.12] - 2024-06-24

### Changed in 1.4.12

- In `Dockerfile`, updated FROM instruction to `senzing/senzingapi-tools:3.10.3`
- In `requirements.txt`, updated:
- orjson==3.10.5
- python-socketio==5.11.3
- setuptools==70.1.0

## [1.4.12] - 2024-06-10

### Changed in 1.4.12
Expand Down
122 changes: 61 additions & 61 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=senzing/senzingapi-tools:3.10.1
ARG BASE_IMAGE=senzing/senzingapi-tools:3.10.3

ARG IMAGE_NAME="senzing/sshd"
ARG IMAGE_MAINTAINER="support@senzing.com"
ARG IMAGE_VERSION="1.4.11"
ARG IMAGE_VERSION="1.4.12"

# -----------------------------------------------------------------------------
# Stage: builder
Expand All @@ -12,7 +12,7 @@ FROM ${BASE_IMAGE} AS builder

# Set Shell to use for RUN commands in builder step.

ENV REFRESHED_AT=2024-05-22
ENV REFRESHED_AT=2024-06-24

# Run as "root" for system installation.

Expand All @@ -23,27 +23,27 @@ USER root
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update \
&& apt-get -y install \
gcc \
make \
pkg-config \
unzip \
wget \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
gcc \
make \
pkg-config \
unzip \
wget \
&& rm -rf /var/lib/apt/lists/*

# Work around until Debian repos catch up to modern versions of fio.

RUN mkdir /tmp/fio \
&& cd /tmp/fio \
&& wget https://github.com/axboe/fio/archive/refs/tags/fio-3.30.zip \
&& unzip fio-3.30.zip \
&& cd fio-fio-3.30/ \
&& ./configure \
&& make \
&& make install \
&& fio --version \
&& cd \
&& rm -rf /tmp/fio
&& cd /tmp/fio \
&& wget https://github.com/axboe/fio/archive/refs/tags/fio-3.30.zip \
&& unzip fio-3.30.zip \
&& cd fio-fio-3.30/ \
&& ./configure \
&& make \
&& make install \
&& fio --version \
&& cd \
&& rm -rf /tmp/fio

# -----------------------------------------------------------------------------
# Stage: Final
Expand All @@ -58,8 +58,8 @@ ARG IMAGE_MAINTAINER
ARG IMAGE_VERSION

LABEL Name=${IMAGE_NAME} \
Maintainer=${IMAGE_MAINTAINER} \
Version=${IMAGE_VERSION}
Maintainer=${IMAGE_MAINTAINER} \
Version=${IMAGE_VERSION}

# Define health check.

Expand All @@ -74,51 +74,51 @@ USER root
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update \
&& apt-get -y install \
elvis-tiny \
htop \
iotop \
jq \
net-tools \
openssh-server \
postgresql-common \
procps \
python3-dev \
python3-pip \
python3-pyodbc \
strace \
tree \
unzip \
wget \
zip \
&& /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
&& apt-get -y install postgresql-client-14 \
&& rm -rf /var/lib/apt/lists/*
&& apt-get -y install \
elvis-tiny \
htop \
iotop \
jq \
net-tools \
openssh-server \
postgresql-common \
procps \
python3-dev \
python3-pip \
python3-pyodbc \
strace \
tree \
unzip \
wget \
zip \
&& /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \
&& apt-get -y install postgresql-client-14 \
&& rm -rf /var/lib/apt/lists/*

# Install packages via pip.

COPY requirements.txt .
RUN pip3 install --upgrade pip \
&& pip3 install -r requirements.txt \
&& rm /requirements.txt
&& pip3 install -r requirements.txt \
&& rm /requirements.txt

# Configure sshd.

RUN mkdir /var/run/sshd \
&& sed -i -e '$aPermitRootLogin yes' /etc/ssh/sshd_config \
&& sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \
&& echo "export LANGUAGE=C" >> /etc/profile \
&& echo "export LC_ALL=C.UTF-8" >> /etc/profile \
&& echo "export LD_LIBRARY_PATH=/opt/senzing/g2/lib" >> /etc/profile \
&& echo "export PATH=${PATH}" >> /etc/profile \
&& echo "export PYTHONPATH=/opt/senzing/g2/python:/opt/senzing/g2/sdk/python" >> /etc/profile \
&& echo "export PYTHONUNBUFFERED=1" >> /etc/profile \
&& echo "export NOTVISIBLE='in users profile'" >> /etc/profile \
&& echo "export ROOT_PASSWORD=senzingsshdpassword" >> /etc/profile \
&& echo "export SENZING_DOCKER_LAUNCHED=true" >> /etc/profile \
&& echo "export SENZING_SKIP_DATABASE_PERFORMANCE_TEST=true" >> /etc/profile \
&& echo "export SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true" >> /etc/profile \
&& echo "export VISIBLE=now" >> /etc/profile
&& sed -i -e '$aPermitRootLogin yes' /etc/ssh/sshd_config \
&& sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \
&& echo "export LANGUAGE=C" >> /etc/profile \
&& echo "export LC_ALL=C.UTF-8" >> /etc/profile \
&& echo "export LD_LIBRARY_PATH=/opt/senzing/g2/lib" >> /etc/profile \
&& echo "export PATH=${PATH}" >> /etc/profile \
&& echo "export PYTHONPATH=/opt/senzing/g2/python:/opt/senzing/g2/sdk/python" >> /etc/profile \
&& echo "export PYTHONUNBUFFERED=1" >> /etc/profile \
&& echo "export NOTVISIBLE='in users profile'" >> /etc/profile \
&& echo "export ROOT_PASSWORD=senzingsshdpassword" >> /etc/profile \
&& echo "export SENZING_DOCKER_LAUNCHED=true" >> /etc/profile \
&& echo "export SENZING_SKIP_DATABASE_PERFORMANCE_TEST=true" >> /etc/profile \
&& echo "export SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true" >> /etc/profile \
&& echo "export VISIBLE=now" >> /etc/profile

# Copy files from repository.

Expand All @@ -135,9 +135,9 @@ EXPOSE 22
# Runtime environment variables.

ENV NOTVISIBLE="in users profile" \
ROOT_PASSWORD=senzingsshdpassword \
SENZING_ETC_PATH=/etc/opt/senzing \
SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true
ROOT_PASSWORD=senzingsshdpassword \
SENZING_ETC_PATH=/etc/opt/senzing \
SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true

# Runtime execution.

Expand Down

0 comments on commit fb6f222

Please sign in to comment.