Skip to content
Snippets Groups Projects
Unverified Commit 4b5f0a70 authored by Ugur Yilmaz's avatar Ugur Yilmaz
Browse files

ST-1397: Change to symlink instead of path due to root user resetting path

This causes if run with sudo it fails in runtime image
parent c355cb55
No related branches found
No related tags found
No related merge requests found
.make @ 6e2ebe00
Subproject commit aeef46bcc6c3386fd046d23978b347c21fd37e7d
Subproject commit 6e2ebe0077290aade5c6349a62c5c53f688df488
......@@ -56,9 +56,8 @@ RUN python3 -m pip install numpy==1.19.2
# Install poetry as a binary
ENV POETRY_HOME=/opt/poetry
RUN curl -sSL https://install.python-poetry.org | python3 - --yes
ENV PATH="${POETRY_HOME}/bin:${PATH}"
COPY requirements.txt /requirements.txt
RUN python3 -m pip install -r /requirements.txt
RUN ln -sfn /usr/bin/python3 /usr/bin/python
RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /usr/local/bin/poetry /opt/poetry/bin/poetry
......@@ -5,7 +5,7 @@
#
ARG CAR_PYPI_REPOSITORY_URL
ARG CAR_OCI_REGISTRY_HOST
ARG BUILD_IMAGE="ska-tango-images-pytango-builder:0.3.17"
ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-pytango-builder:0.3.17"
ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp:9.3.11"
FROM ${BUILD_IMAGE} as buildenv
......@@ -50,10 +50,10 @@ COPY --from=buildenv /opt/poetry /opt/poetry
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
COPY pip.conf /etc/pip.conf
RUN ln -sfn /usr/bin/python3 /usr/bin/python
RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /usr/local/bin/poetry /opt/poetry/bin/poetry
USER tango
ENV PATH="/opt/poetry/bin:/home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
ENV PATH="home/tango/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}"
ONBUILD COPY --chown=tango:tango . /app
ONBUILD COPY --from=buildenv /usr/local/bin/ /usr/local/bin/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment