Skip to content

Commit 08ea395

Browse files
authored
Merge pull request #210 from pacospace/do-not-use-curl
Do not use curl but copy requirements.txt
2 parents 74a9ee4 + 0e4cc83 commit 08ea395

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

f34-py39/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ LABEL summary="$SUMMARY" \
2626

2727
USER 0
2828
COPY ./s2i_assemble.patch /tmp/s2i_assemble.patch
29+
COPY ./requirements.txt $HOME/requirements.txt
2930
RUN TMPFILE=$(mktemp) && \
3031
TMPFILE_ASSEMBLE=$(mktemp) && \
3132
pushd "${STI_SCRIPTS_PATH}" && patch -p 1 </tmp/s2i_assemble.patch && popd && \
3233
pip3 install -U "pip==20.3.3" && \
3334
/usr/bin/pip3 install -U "pip==20.3.3" && \
34-
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/f34-py39/requirements.txt" -o requirements.txt && \
35-
MICROPIPENV_NO_LOCKFILE_WRITE=1 MICROPIPENV_PIP_BIN=/usr/bin/pip3 curl https://raw.githubusercontent.com/thoth-station/micropipenv/master/micropipenv.py | /usr/bin/python3 - install -- && \
35+
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 -- && \
3636
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/assemble" -o "${TMPFILE_ASSEMBLE}" && \
3737
cp "${STI_SCRIPTS_PATH}/assemble" "${TMPFILE}" && \
3838
head -n1 "${TMPFILE}" >"${STI_SCRIPTS_PATH}/assemble" && \

ubi8-py36/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ LABEL summary="$SUMMARY" \
2626

2727
USER 0
2828
COPY ./s2i_assemble.patch /tmp/s2i_assemble.patch
29+
COPY ./requirements.txt $HOME/requirements.txt
2930
RUN TMPFILE=$(mktemp) && \
3031
TMPFILE_ASSEMBLE=$(mktemp) && \
3132
pushd "${STI_SCRIPTS_PATH}" && patch -p 1 </tmp/s2i_assemble.patch && popd && \
3233
pip3 install -U "pip==20.3.3" && \
3334
/usr/bin/pip3 install -U "pip==20.3.3" && \
34-
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/ubi8-py36/requirements.txt" -o requirements.txt && \
35-
MICROPIPENV_NO_LOCKFILE_WRITE=1 MICROPIPENV_PIP_BIN=/usr/bin/pip3 curl https://raw.githubusercontent.com/thoth-station/micropipenv/master/micropipenv.py | /usr/bin/python3 - install -- && \
35+
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 -- && \
3636
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/assemble" -o "${TMPFILE_ASSEMBLE}" && \
3737
cp "${STI_SCRIPTS_PATH}/assemble" "${TMPFILE}" && \
3838
head -n1 "${TMPFILE}" >"${STI_SCRIPTS_PATH}/assemble" && \

ubi8-py38/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ LABEL summary="$SUMMARY" \
2626

2727
USER 0
2828
COPY ./s2i_assemble.patch /tmp/s2i_assemble.patch
29+
COPY ./requirements.txt $HOME/requirements.txt
2930
RUN TMPFILE=$(mktemp) && \
3031
TMPFILE_ASSEMBLE=$(mktemp) && \
3132
pushd "${STI_SCRIPTS_PATH}" && patch -p 1 </tmp/s2i_assemble.patch && popd && \
3233
pip3 install -U "pip==20.3.3" && \
3334
/usr/bin/pip3 install -U "pip==20.3.3" && \
34-
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/ubi8-py38/requirements.txt" -o requirements.txt && \
35-
MICROPIPENV_NO_LOCKFILE_WRITE=1 MICROPIPENV_PIP_BIN=/usr/bin/pip3 curl https://raw.githubusercontent.com/thoth-station/micropipenv/master/micropipenv.py | /usr/bin/python3 - install -- && \
35+
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 -- && \
3636
curl "https://raw.githubusercontent.com/thoth-station/s2i-thoth/master/assemble" -o "${TMPFILE_ASSEMBLE}" && \
3737
cp "${STI_SCRIPTS_PATH}/assemble" "${TMPFILE}" && \
3838
head -n1 "${TMPFILE}" >"${STI_SCRIPTS_PATH}/assemble" && \

0 commit comments

Comments
 (0)