update s2i version and remove not necessary content

Signed-off-by: Francesco Murdaca <[email protected]>
thoth-station · Jul 23, 2021 · 6f3d8c3 · 6f3d8c3
1 parent cd5c147
commit 6f3d8c3
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 626 deletions.
diff --git a/f32-py38/Dockerfile b/f32-py38/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.fedoraproject.org/f32/python3:latest
 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 31. It includes Pipenv." \
     THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-f32-py38 \
-    THOTH_S2I_VERSION=0.30.0 \
+    THOTH_S2I_VERSION=0.31.0 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

diff --git a/f32-py38/s2i_assemble.patch b/f32-py38/s2i_assemble.patch
@@ -31,11 +31,9 @@
 -# First of all, check that we don't have disallowed combination of ENVs
 -if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
 -  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
--  # podman/buildah does not relay this exit code but it will be fixed hopefuly
--  # https://github.com/containers/buildah/issues/2305
 -  exit 3
 -fi
--
+
  shopt -s dotglob
  echo "---> Installing application source ..."
  mv /tmp/src/* "$HOME"

diff --git a/f34-py39/Dockerfile b/f34-py39/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.fedoraproject.org/f34/python3:latest
 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 34. It includes Pipenv." \
     THOTH_S2I_NAME=quay.io/thoth-station/s2i-thoth-f34-py39 \
-    THOTH_S2I_VERSION=0.30.0 \
+    THOTH_S2I_VERSION=0.31.0 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

diff --git a/f34-py39/s2i_assemble.patch b/f34-py39/s2i_assemble.patch
@@ -31,8 +31,6 @@
 -# First of all, check that we don't have disallowed combination of ENVs
 -if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
 -  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
--  # podman/buildah does not relay this exit code but it will be fixed hopefuly
--  # https://github.com/containers/buildah/issues/2305
 -  exit 3
 -fi
 -

diff --git a/ubi8-py36/Dockerfile b/ubi8-py36/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/python-36:1-148
 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.30.0 \
+    THOTH_S2I_VERSION=0.31.0 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

diff --git a/ubi8-py36/requirements.txt b/ubi8-py36/requirements.txt
diff --git a/ubi8-py36/s2i_assemble.patch b/ubi8-py36/s2i_assemble.patch
@@ -31,8 +31,6 @@
 -# First of all, check that we don't have disallowed combination of ENVs
 -if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
 -  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
--  # podman/buildah does not relay this exit code but it will be fixed hopefuly
--  # https://github.com/containers/buildah/issues/2305
 -  exit 3
 -fi
 -

diff --git a/ubi8-py38/Dockerfile b/ubi8-py38/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/python-38:1-60
 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.30.0 \
+    THOTH_S2I_VERSION=0.31.0 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

diff --git a/ubi8-py38/requirements.txt b/ubi8-py38/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    pip-compile --generate-hashes requirements.in
@@ -604,3 +604,4 @@ yaspin==2.0.0 \
 # pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
 # pip
 # setuptools
+The generated requirements file may be rejected by pip install. See # WARNING lines for details.
diff --git a/ubi8-py38/s2i_assemble.patch b/ubi8-py38/s2i_assemble.patch
@@ -31,8 +31,6 @@
 -# First of all, check that we don't have disallowed combination of ENVs
 -if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
 -  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
--  # podman/buildah does not relay this exit code but it will be fixed hopefuly
--  # https://github.com/containers/buildah/issues/2305
 -  exit 3
 -fi
 -

diff --git a/ubi8-py39/Dockerfile b/ubi8-py39/Dockerfile
@@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/python-39:1-10
 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.30.0 \
+    THOTH_S2I_VERSION=0.31.0 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

diff --git a/ubi8-py39/s2i_assemble.patch b/ubi8-py39/s2i_assemble.patch
@@ -31,8 +31,6 @@
 -# First of all, check that we don't have disallowed combination of ENVs
 -if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
 -  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
--  # podman/buildah does not relay this exit code but it will be fixed hopefuly
--  # https://github.com/containers/buildah/issues/2305
 -  exit 3
 -fi
 -