maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-26 06:37:21 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

good-changes

Browse source
This commit is contained in:
Jackson Delahunt 2020-09-11 15:52:27 +10:00
parent 1a9536e124
commit 21be0325a4
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docker/Dockerfile
View file

@ -403,18 +403,10 @@ RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.co
echo needs_root_rights=yes >> /etc/X11/Xwrapper.config && \
chmod u+s /usr/bin/xinit
# Create the docker group with the host os group id, backing up any existing group with docker group id
ENV DOCKER_GROUP 999
RUN getent group $DOCKER_GROUP | \
grep -v docker | \
cut -d: -f1 | \
xargs groupmod --gid 9999 2>/dev/null || true
RUN groupmod --gid $DOCKER_GROUP docker
# Create a non-root user for safe operation
RUN useradd \
--create-home \
--groups $DOCKER_GROUP,audio,chrome,input,netdev,shadow,sudo,tty,video \
--groups audio,chrome,docker,input,netdev,shadow,sudo,tty,video \
--shell /bin/zsh \
$USER

3
docker/scripts/test.sh
View file

@ -23,4 +23,5 @@ until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER_NAME | grep Status | grep -m
# Start the desktop environment inside the container
$REPO_ROOT/docker/scripts/exec.sh /home/$DESKTOP_ENVIRONMENT_USER/.config/scripts/vnc.sh
#
# Check desktop environment started successfully
curl --silent localhost | grep -iq vnc