Skip to content
Snippets Groups Projects
Commit 928ba74a authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

Merge branch 'master' into L2SS-747-fix-master

parents 747179b4 c807b7e5
No related branches found
No related tags found
1 merge request!303L2SS-747: Fix integration tests
...@@ -35,7 +35,7 @@ else ...@@ -35,7 +35,7 @@ else
mkdir -p /tmp/tangostationcontrol mkdir -p /tmp/tangostationcontrol
python3 setup.py build --build-base /tmp/tangostationcontrol egg_info --egg-base /tmp/tangostationcontrol bdist_wheel --dist-dir /tmp/tangostationcontrol || exit 1 python3 setup.py build --build-base /tmp/tangostationcontrol egg_info --egg-base /tmp/tangostationcontrol bdist_wheel --dist-dir /tmp/tangostationcontrol || exit 1
# shellcheck disable=SC2012 # shellcheck disable=SC2012
sudo pip install "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)" pip install "$(ls -Art /tmp/tangostationcontrol/*.whl | tail -n 1)"
fi fi
# Return to the stored the directory, this preserves the working_dir argument in # Return to the stored the directory, this preserves the working_dir argument in
......
...@@ -5,9 +5,8 @@ FROM ${SOURCE_IMAGE} ...@@ -5,9 +5,8 @@ FROM ${SOURCE_IMAGE}
# that are needed for temporary storage the proper owner and access rights. # that are needed for temporary storage the proper owner and access rights.
ARG CONTAINER_EXECUTION_UID=1000 ARG CONTAINER_EXECUTION_UID=1000
# Create homedir # Create new user with uid but only if uid not used
ENV HOME=/home/user RUN sudo adduser --disabled-password --system --uid ${CONTAINER_EXECUTION_UID} --no-create-home --home ${HOME} user || exit 0
RUN sudo mkdir -p ${HOME}
RUN sudo chown ${CONTAINER_EXECUTION_UID} -R ${HOME} RUN sudo chown ${CONTAINER_EXECUTION_UID} -R ${HOME}
COPY requirements.txt ./ COPY requirements.txt ./
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment