This commit is contained in:
Jackson Delahunt 2020-09-15 08:56:43 +10:00
parent 56ff29ac2e
commit 117bccaebd
5 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -5,4 +5,5 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
docker exec \
--interactive \
--user root \
$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*"

View file

@ -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 "$*"

View file

@ -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 \

View file

@ -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