Skip to content

Commit

Permalink
Merge pull request #264 from goern/base-image-updates
Browse files Browse the repository at this point in the history
base image updates
  • Loading branch information
sesheta authored Nov 15, 2022
2 parents 939190d + 745f94a commit 85d4ee4
Show file tree
Hide file tree
Showing 13 changed files with 1,285 additions and 1,297 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.lock
a/*
b/*
.vscode/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.3.0
rev: v1.3.1
hooks:
- id: remove-tabs

Expand Down
2 changes: 1 addition & 1 deletion .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ presubmits:
context: aicoe-ci/prow/pre-commit
spec:
containers:
- image: quay.io/thoth-station/thoth-precommit-py38:v0.14.3
- image: quay.io/thoth-station/thoth-precommit-py38:v0.15.0
command:
- "pre-commit"
- "run"
Expand Down
6 changes: 3 additions & 3 deletions f35-py310/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Thoth's extension to OpenShift's S2I build
FROM registry.fedoraproject.org/f35/python3:0-41.container
FROM quay.io/fedora/python-310@sha256:ea54c8e19b91073a11a594ab6a7368bea199bcf8cdc0a164e1111eeb82dd0de6

ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Fedora 35. It includes Pipenv." \
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-f35-py310 \
THOTH_S2I_VERSION=0.34.1 \
THOTH_S2I_VERSION=0.35.1 \
THAMOS_NO_PROGRESSBAR=1 \
THAMOS_NO_EMOJI=1 \
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
Expand All @@ -17,7 +17,7 @@ LABEL summary="$SUMMARY" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="python,python310" \
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
vendor="Project Thoth, Red Hat Inc." \
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
version="$THOTH_S2I_VERSION" \
release="0" \
Expand Down
710 changes: 367 additions & 343 deletions f35-py310/requirements.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ubi8-py36/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Thoth's extension to OpenShift's S2I build
FROM registry.access.redhat.com/ubi8/python-36:1-184
FROM registry.access.redhat.com/ubi8/python-36@sha256:d681eb696f601759cd37ef39fca0e9fec5664f6806c75aae65382b9fd68936ae

ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Red Hat UBI8. It includes pipenv." \
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-ubi8-py36 \
THOTH_S2I_VERSION=0.34.1 \
THOTH_S2I_VERSION=0.35.1 \
THAMOS_NO_PROGRESSBAR=1 \
THAMOS_NO_EMOJI=1 \
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
Expand All @@ -15,9 +15,9 @@ LABEL summary="$SUMMARY" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="Thoth Python 3.6-ubi8 S2I" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="python,python36" \
io.openshift.tags="python,python36,python36:1-197.1666661057" \
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
vendor="Project Thoth, Red Hat Inc." \
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
version="$THOTH_S2I_VERSION" \
release="0" \
Expand Down
650 changes: 266 additions & 384 deletions ubi8-py36/requirements.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ubi8-py38/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Thoth's extension to OpenShift's S2I build
FROM registry.access.redhat.com/ubi8/python-38@sha256:fd3667f1616bb49c35ef75202d01739dd73271559d80b047d60bfa4318e910b2
FROM registry.access.redhat.com/ubi8/python-38@sha256:211591c97d27de6a1db8e78f40cfd0c1a08dc5e84df2ee77e047fb6ea36a9b89

ENV SUMMARY="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications" \
DESCRIPTION="Thoth's Source-to-Image for Python ${PYTHON_VERSION} applications. This toolchain is based on Red Hat UBI8. It includes pipenv." \
THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-ubi8-py38 \
THOTH_S2I_VERSION=0.35.0 \
THOTH_S2I_VERSION=0.35.1 \
THAMOS_NO_PROGRESSBAR=1 \
THAMOS_NO_EMOJI=1 \
MICROPIPENV_NO_LOCKFILE_PRINT=0 \
Expand All @@ -15,9 +15,9 @@ LABEL summary="$SUMMARY" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="Thoth Python 3.8-ubi8 S2I" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="python,python38,python38:1-104" \
io.openshift.tags="python,python38,python38:1-114.1666661055" \
name="$THOTH_S2I_NAME:v$THOTH_S2I_VERSION" \
vendor="AICoE at the Office of the CTO, Red Hat Inc." \
vendor="Project Thoth, Red Hat Inc." \
authoritative-source-url="https://quay.io/thoth-station/s2i-thoth" \
version="$THOTH_S2I_VERSION" \
release="0" \
Expand Down
415 changes: 221 additions & 194 deletions ubi8-py38/requirements.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ubi8-py39/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Thoth's extension to OpenShift's S2I build
FROM registry.access.redhat.com/ubi8/python-39@sha256:84639af111ab2b3fd7ca325f0912e405c117df31c976446b2a1902948f65a61d
FROM registry.access.redhat.com/ubi8/python-39@sha256:45a354a874eb37f55bcbc969f064d118e240e301373d85659593575efca9abfb

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

0 comments on commit 85d4ee4

Please sign in to comment.