diff --git a/docker/Dockerfile b/docker/Dockerfile index fa618b2..bda27c6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -316,7 +316,7 @@ RUN wget -O skype.deb -q https://go.skype.com/skypeforlinux-64.deb && \ rm skype.deb # Install slack -RUN wget -O slack.deb -nv https://downloads.slack-edge.com/linux_releases/slack-desktop-4.1.1-amd64.deb && \ +RUN wget -O slack.deb -nv https://downloads.slack-edge.com/linux_releases/slack-desktop-4.9.1-amd64.deb && \ dpkg -i slack.deb || apt-get install -qq --fix-broken && \ rm slack.deb diff --git a/docker/scripts/exec-root.sh b/docker/scripts/exec-root.sh index 0cc44e7..ebdf4b0 100755 --- a/docker/scripts/exec-root.sh +++ b/docker/scripts/exec-root.sh @@ -5,4 +5,5 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)" docker exec \ --interactive \ + --user root \ $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*" diff --git a/docker/scripts/exec.sh b/docker/scripts/exec.sh index d5d7776..01f491c 100755 --- a/docker/scripts/exec.sh +++ b/docker/scripts/exec.sh @@ -6,5 +6,4 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)" docker exec \ --interactive \ --tty \ - --user $DESKTOP_ENVIRONMENT_USER \ $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*" diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index eecbeb7..012176c 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -33,7 +33,6 @@ docker run \ --network host \ --rm \ --security-opt apparmor:unconfined \ - --user $DESKTOP_ENVIRONMENT_USER \ --volume /dev/displaylink:/dev/displaylink \ --volume /dev/shm:/dev/shm \ --volume /run/udev:/run/udev \ diff --git a/docker/scripts/test.sh b/docker/scripts/test.sh index 30f95ce..42322fe 100755 --- a/docker/scripts/test.sh +++ b/docker/scripts/test.sh @@ -15,11 +15,12 @@ docker run \ --env DESKTOP_ENVIRONMENT_USER \ --name $DESKTOP_ENVIRONMENT_CONTAINER_NAME \ --rm \ - --user $DESKTOP_ENVIRONMENT_USER \ --workdir $DESKTOP_ENVIRONMENT_USER_HOME \ $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \ sleep infinity +exit 1 + # Wait until the desktop environment test container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m 1 running >/dev/null; do sleep 1; done