Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

Commit

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

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

-

## [1.1.7] - 2024-05-22

### Changed in 1.1.7

- 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
- prettytable==3.10.0
- python-engineio==4.9.1
- python-socketio==5.11.2
- setuptools==70.0.0
- VisiData==3.0.2

## [1.1.6] - 2023-09-30

### Changed in 1.1.6
Expand Down
100 changes: 50 additions & 50 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/entity-search-web-app-console"
ARG IMAGE_MAINTAINER="[email protected]"
ARG IMAGE_VERSION="1.1.6"
ARG IMAGE_VERSION="1.1.7"

# -----------------------------------------------------------------------------
# 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-18
ENV REFRESHED_AT=2024-05-22

# Run as "root" for system installation.

Expand Down Expand Up @@ -45,27 +45,27 @@ COPY package-lock.json /app/package-lock.json
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 @@ -75,11 +75,11 @@ RUN mkdir /tmp/fio \

FROM ${BASE_IMAGE} AS runner

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

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

# Define health check.

Expand All @@ -94,41 +94,41 @@ USER root
ENV DEBIAN_FRONTEND noninteractive

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

# Install Nodejs

RUN wget -q -O - https://deb.nodesource.com/setup_16.x | bash -

RUN apt-get -yq install \
nodejs \
&& node -v
nodejs \
&& node -v

# 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

# Copy files from repository.

Expand All @@ -152,15 +152,15 @@ EXPOSE 5000
# Make non-root container.

RUN addgroup --gid 1004 consoleusers \
&& useradd -u 1001 -g 1004 -m senzing -s /bin/bash
&& useradd -u 1001 -g 1004 -m senzing -s /bin/bash

USER 1001

# Runtime environment variables.

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

# Runtime execution.
WORKDIR /app
Expand Down

0 comments on commit 41b5239

Please sign in to comment.