Skip to content

Commit

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

* prepare for versioned release

* fix date
  • Loading branch information
kernelsam authored May 22, 2024
1 parent b8b8657 commit 3740a2d
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 48 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [1.4.16] - 2024-05-22

### Changed in 1.4.16

- In `Dockerfile`, updated FROM instruction to `senzing/senzingapi-tools:3.10.1`
- In `requirements.txt`, updated:
- csvkit==2.0.0
- Flask==3.0.3
- orjson==3.10.3
- pandas==2.2.2
- python-engineio==4.9.1
- python-socketio==5.11.2
- setuptools==70.0.0

## [1.4.15] - 2024-03-19

### Changed in 1.4.15
Expand Down
96 changes: 48 additions & 48 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG BASE_IMAGE=senzing/senzingapi-tools:3.9.0
ARG BASE_IMAGE=senzing/senzingapi-tools:3.10.1
ARG BASE_BUILDER_IMAGE=node:lts-buster-slim

ARG IMAGE_NAME="senzing/xterm"
ARG IMAGE_MAINTAINER="support@senzing.com"
ARG IMAGE_VERSION="1.4.14"
ARG IMAGE_VERSION="1.4.16"

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

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

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

# Run as "root" for system installation.

Expand All @@ -35,34 +35,34 @@ COPY package-lock.json /app/package-lock.json
# Build js packages.

RUN npm config set loglevel warn \
&& npm install
&& npm install

# Install packages via apt for building fio.

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: python
Expand All @@ -77,10 +77,10 @@ FROM ${BASE_IMAGE} AS python
ENV DEBIAN_FRONTEND noninteractive

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

# Create and activate virtual environment.

Expand All @@ -91,8 +91,8 @@ ENV PATH="/app/venv/bin:$PATH"

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

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

FROM ${BASE_IMAGE} AS runner

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

ARG IMAGE_NAME
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 @@ -125,23 +125,23 @@ USER root
ENV DEBIAN_FRONTEND noninteractive

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

# Copy files from repository.

Expand Down Expand Up @@ -176,7 +176,7 @@ ENV PATH="/app/venv/bin:${PATH}"
# Runtime environment variables.

ENV LC_CTYPE=C.UTF-8 \
SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true
SENZING_SSHD_SHOW_PERFORMANCE_WARNING=true

# Runtime execution.

Expand Down

0 comments on commit 3740a2d

Please sign in to comment.