Skip to content

Commit 85d4ee4

Browse files
authored
Merge pull request #264 from goern/base-image-updates
base image updates
2 parents 939190d + 745f94a commit 85d4ee4

13 files changed

+1285
-1297
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.lock
22
a/*
33
b/*
4+
.vscode/

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/Lucas-C/pre-commit-hooks
4-
rev: v1.3.0
4+
rev: v1.3.1
55
hooks:
66
- id: remove-tabs
77

.prow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ presubmits:
66
context: aicoe-ci/prow/pre-commit
77
spec:
88
containers:
9-
- image: quay.io/thoth-station/thoth-precommit-py38:v0.14.3
9+
- image: quay.io/thoth-station/thoth-precommit-py38:v0.15.0
1010
command:
1111
- "pre-commit"
1212
- "run"

f35-py310/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Thoth's extension to OpenShift's S2I build
2-
FROM registry.fedoraproject.org/f35/python3:0-41.container
2+
FROM quay.io/fedora/python-310@sha256:ea54c8e19b91073a11a594ab6a7368bea199bcf8cdc0a164e1111eeb82dd0de6
33

44
ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
55
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Fedora 35. It includes Pipenv." \
66
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-f35-py310 \
7-
THOTH_S2I_VERSION=0.34.1 \
7+
THOTH_S2I_VERSION=0.35.1 \
88
THAMOS_NO_PROGRESSBAR=1 \
99
THAMOS_NO_EMOJI=1 \
1010
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
@@ -17,7 +17,7 @@ LABEL summary="$SUMMARY" \
1717
io.openshift.expose-services="8080:http" \
1818
io.openshift.tags="python,python310" \
1919
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
20-
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
20+
vendor="Project Thoth, Red Hat Inc." \
2121
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
2222
version="$THOTH_S2I_VERSION" \
2323
release="0" \

f35-py310/requirements.txt

+367-343
Large diffs are not rendered by default.

ubi8-py36/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Thoth's extension to OpenShift's S2I build
2-
FROM registry.access.redhat.com/ubi8/python-36:1-184
2+
FROM registry.access.redhat.com/ubi8/python-36@sha256:d681eb696f601759cd37ef39fca0e9fec5664f6806c75aae65382b9fd68936ae
33

44
ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
55
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Red Hat UBI8. It includes pipenv." \
66
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-ubi8-py36 \
7-
THOTH_S2I_VERSION=0.34.1 \
7+
THOTH_S2I_VERSION=0.35.1 \
88
THAMOS_NO_PROGRESSBAR=1 \
99
THAMOS_NO_EMOJI=1 \
1010
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
@@ -15,9 +15,9 @@ LABEL summary="$SUMMARY" \
1515
io.k8s.description="$DESCRIPTION" \
1616
io.k8s.display-name="Thoth Python 3.6-ubi8 S2I" \
1717
io.openshift.expose-services="8080:http" \
18-
io.openshift.tags="python,python36" \
18+
io.openshift.tags="python,python36,python36:1-197.1666661057" \
1919
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
20-
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
20+
vendor="Project Thoth, Red Hat Inc." \
2121
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
2222
version="$THOTH_S2I_VERSION" \
2323
release="0" \

ubi8-py36/requirements.txt

+266-384
Large diffs are not rendered by default.

ubi8-py38/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Thoth's extension to OpenShift's S2I build
2-
FROM registry.access.redhat.com/ubi8/python-38@sha256:fd3667f1616bb49c35ef75202d01739dd73271559d80b047d60bfa4318e910b2
2+
FROM registry.access.redhat.com/ubi8/python-38@sha256:211591c97d27de6a1db8e78f40cfd0c1a08dc5e84df2ee77e047fb6ea36a9b89
33

44
ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
55
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Red Hat UBI8. It includes pipenv." \
66
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-ubi8-py38 \
7-
THOTH_S2I_VERSION=0.35.0 \
7+
THOTH_S2I_VERSION=0.35.1 \
88
THAMOS_NO_PROGRESSBAR=1 \
99
THAMOS_NO_EMOJI=1 \
1010
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
@@ -15,9 +15,9 @@ LABEL summary="$SUMMARY" \
1515
io.k8s.description="$DESCRIPTION" \
1616
io.k8s.display-name="Thoth Python 3.8-ubi8 S2I" \
1717
io.openshift.expose-services="8080:http" \
18-
io.openshift.tags="python,python38,python38:1-104" \
18+
io.openshift.tags="python,python38,python38:1-114.1666661055" \
1919
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
20-
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
20+
vendor="Project Thoth, Red Hat Inc." \
2121
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
2222
version="$THOTH_S2I_VERSION" \
2323
release="0" \

ubi8-py38/requirements.txt

+221-194
Large diffs are not rendered by default.

ubi8-py39/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Thoth's extension to OpenShift's S2I build
2-
FROM registry.access.redhat.com/ubi8/python-39@sha256:84639af111ab2b3fd7ca325f0912e405c117df31c976446b2a1902948f65a61d
2+
FROM registry.access.redhat.com/ubi8/python-39@sha256:45a354a874eb37f55bcbc969f064d118e240e301373d85659593575efca9abfb
33

44
ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
55
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Red Hat UBI8. It includes pipenv." \
66
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-ubi8-py39 \
7-
THOTH_S2I_VERSION=0.35.0 \
7+
THOTH_S2I_VERSION=0.35.1 \
88
THAMOS_NO_PROGRESSBAR=1 \
99
THAMOS_NO_EMOJI=1 \
1010
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
@@ -15,9 +15,9 @@ LABEL summary="$SUMMARY" \
1515
io.k8s.description="$DESCRIPTION" \
1616
io.k8s.display-name="Thoth Python 3.9-ubi8 S2I" \
1717
io.openshift.expose-services="8080:http" \
18-
io.openshift.tags="python,python39,python39:1-67" \
18+
io.openshift.tags="python,python39,python39:1-83.1666661053" \
1919
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
20-
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
20+
vendor="Project Thoth, Red Hat Inc." \
2121
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
2222
version="$THOTH_S2I_VERSION" \
2323
release="0" \

0 commit comments

Comments
 (0)