Merge pull request #212 from harshad16/fix-ubi8-py39

Fix up the assemble script with the s2i-assemble

Author: sesheta

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.31.0 \
+    THOTH_S2I_VERSION=0.31.1 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

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.31.0 \
+    THOTH_S2I_VERSION=0.31.1 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

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.31.0 \
+    THOTH_S2I_VERSION=0.31.1 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \

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.31.0 \
+    THOTH_S2I_VERSION=0.31.1 \
     THAMOS_NO_PROGRESSBAR=1 \
     THAMOS_NO_EMOJI=1 \
     MICROPIPENV_NO_LOCKFILE_PRINT=0 \
@@ -26,12 +26,20 @@ LABEL summary="$SUMMARY" \
 
 USER 0
 COPY ./s2i_assemble.patch /tmp/s2i_assemble.patch
-COPY ./requirements.txt /tmp/requirements.txt
-RUN pushd "${STI_SCRIPTS_PATH}" && patch -p 1 </tmp/s2i_assemble.patch && popd && \
+COPY ./requirements.txt $HOME/requirements.txt
+RUN TMPFILE=$(mktemp) && \
+    TMPFILE_ASSEMBLE=$(mktemp) && \
+    pushd "${STI_SCRIPTS_PATH}" && patch -p 1 </tmp/s2i_assemble.patch && popd && \
     pip3 install -U "pip==21.1.3" && \
     /usr/bin/pip3 install -U "pip==21.1.3" && \
-    /usr/bin/pip3 install -U "micropipenv" && \
-    pushd /tmp && MICROPIPENV_NO_LOCKFILE_WRITE=1 MICROPIPENV_PIP_BIN=/usr/bin/pip3 micropipenv install && popd && \
+    curl https://raw.githubusercontent.com/thoth-station/micropipenv/master/micropipenv.py | MICROPIPENV_NO_LOCKFILE_WRITE=1 MICROPIPENV_PIP_BIN=/usr/bin/pip3 /usr/bin/python3 - install -- && \
+    curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/assemble" -o "${TMPFILE_ASSEMBLE}" && \
+    cp "${STI_SCRIPTS_PATH}/assemble" "${TMPFILE}" && \
+    head -n1 "${TMPFILE}" >"${STI_SCRIPTS_PATH}/assemble" && \
+    cat "${TMPFILE_ASSEMBLE}" >>"${STI_SCRIPTS_PATH}/assemble" && \
+    tail -n+2 "${TMPFILE}" >>"${STI_SCRIPTS_PATH}/assemble" && \
+    rm "${TMPFILE}" "${TMPFILE_ASSEMBLE}" /tmp/s2i_assemble.patch requirements.txt && \
+    sed -i '/  echo "---> Running application from .*/d' "${STI_SCRIPTS_PATH}/run" && \
     chown -R 1001:0 ${APP_ROOT} && \
     fix-permissions ${APP_ROOT} -P && \
     yum update --assumeyes --nobest --setopt=tsflags=nodocs