Merge pull request #665 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Sep 25, 2023 · 6b0408d · 6b0408d
2 parents 3f39476 + 94014a7
commit 6b0408d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
@@ -30,7 +30,8 @@ LABEL com.suse.release-stage="beta"
 
 RUN set -euo pipefail; zypper -n in --no-recommends python311-devel python311 python311-pip curl git-core; zypper -n clean; rm -rf /var/log/*
 ENV PYTHON_VERSION="%%py311_ver%%"
+ENV PATH="$PATH:/root/.local/bin"
 ENV PIP_VERSION="%%pip_ver%%"
 
-RUN set -euo pipefail; ln -s /usr/bin/python3.11 /usr/local/bin/python3; \
+RUN set -euo pipefail; install -d -m 0755 /root/.local/bin; ln -s /usr/bin/python3.11 /usr/local/bin/python3; \
     ln -s /usr/bin/pydoc3.11 /usr/local/bin/pydoc
diff --git a/python-3.11-image/python-3.11-image.changes b/python-3.11-image/python-3.11-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 25 11:06:45 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Add /root/.local/bin to PATH, jsc#PED-5573
+
 -------------------------------------------------------------------
 Fri Sep 22 09:32:22 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/python-3.6-image/Dockerfile b/python-3.6-image/Dockerfile
@@ -29,5 +29,7 @@ LABEL com.suse.release-stage="beta"
 
 RUN set -euo pipefail; zypper -n in --no-recommends python3-devel python3 python3-pip curl git-core python3-wheel; zypper -n clean; rm -rf /var/log/*
 ENV PYTHON_VERSION="%%py36_ver%%"
+ENV PATH="$PATH:/root/.local/bin"
 ENV PIP_VERSION="%%pip_ver%%"
 
+RUN set -euo pipefail; install -d -m 0755 /root/.local/bin
diff --git a/python-3.6-image/python-3.6-image.changes b/python-3.6-image/python-3.6-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 25 11:06:45 UTC 2023 - Dirk Mueller <[email protected]>
+
+- Add /root/.local/bin to PATH, jsc#PED-5573
+
 -------------------------------------------------------------------
 Fri Sep 22 09:32:22 UTC 2023 - Dirk Mueller <[email protected]>