From b0a9fc8b9160a2a869720eeec7664108c967fc4b Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:38:31 +0200 Subject: [PATCH] logging honzugefuegt --- ...bullseye.test_target_unified_install.armv7 | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/ci/Dockerfile.bullseye.test_target_unified_install.armv7 b/ci/Dockerfile.bullseye.test_target_unified_install.armv7 index a6f721d4a..15d175c77 100644 --- a/ci/Dockerfile.bullseye.test_target_unified_install.armv7 +++ b/ci/Dockerfile.bullseye.test_target_unified_install.armv7 @@ -38,17 +38,27 @@ FROM base as user # ENV USER=$USER_NAME +ENV TEST_USER_GROUP=test + +RUN groupadd --gid 1002 $TEST_USER_GROUP + RUN export USER=pi &&\ export USER_GROUP=$USER &&\ + echo "USER: $USER" &&\ + echo "USER_GROUP: $USER_GROUP" &&\ groupadd --gid 1000 $USER_GROUP &&\ - useradd -u 1000 -g 1000 -G sudo -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER &&\ - echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER + useradd -u 1000 -g $USER_GROUP -G sudo,$TEST_USER_GROUP -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER &&\ + echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER &&\ + id $USER RUN export USER=hans &&\ export USER_GROUP=wurst &&\ + echo "USER: $USER" &&\ + echo "USER_GROUP: $USER_GROUP" &&\ groupadd --gid 1001 $USER_GROUP &&\ - useradd -u 1001 -g 1001 -G sudo -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER &&\ - echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER + useradd -u 1001 -g $USER_GROUP -G sudo,$TEST_USER_GROUP -d /home/$USER -m -s /bin/bash -p '$1$iV7TOwOe$6ojkJQXyEA9bHd/SqNLNj0' $USER &&\ + echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER &&\ + id $USER FROM user as test @@ -58,9 +68,10 @@ ARG GIT_URL ENV GIT_BRANCH=$GIT_BRANCH GIT_URL=$GIT_URL +RUN echo "TEST_USER_GROUP: $TEST_USER_GROUP" # Define needed files for installation test -COPY --chown=root:$USER_GROUP --chmod=770 scripts/installscripts/tests/*.sh /tests/ -COPY --chown=root:$USER_GROUP --chmod=770 scripts/installscripts/buster-install-default.sh / +COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/tests/*.sh /tests/ +COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/buster-install-default.sh / WORKDIR /tests