maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-29 13:05:56 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

xserver-working

Browse source
This commit is contained in:
Jackson Delahunt 2019-10-06 17:49:41 +11:00
parent 831fb03134
commit 49dfc2d068
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docker/Dockerfile
View file

@ -271,7 +271,9 @@ RUN mkdir /dev/net && \
RUN echo "%sudo ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers
# Configure X11 permissions
RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config
RUN sed -i 's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config && \
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
@ -284,7 +286,7 @@ RUN groupmod --gid $DOCKER_GROUP docker
# Create a non-root user for safe operation
RUN useradd \
--create-home \
--groups $DOCKER_GROUP,audio,chrome,sudo,tty,video \
--groups $DOCKER_GROUP,audio,chrome,input,sudo,tty,video \
--password $USER \
--shell /bin/zsh \
$USER
@ -305,6 +307,7 @@ RUN vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-alacritty.git &
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-alsa.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-code.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-git.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-i3.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-mime.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-musikcube.git & \
vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-scripts.git & \

10
docker/scripts/start.sh
View file

@ -11,21 +11,20 @@ docker network create $DESKTOP_ENVIRONMENT_DOCKER_NETWORK
# Start the desktop environment container
docker run \
--privileged \
--cap-add SYS_PTRACE \
--cap-add NET_ADMIN \
--detach \
--device /dev/dri \
--device /dev/input \
--device /dev/snd \
--device /dev/tty0 \
--device /dev/tty1 \
--device /dev/tty2 \
--device /dev/tty3 \
--device /dev/tty4 \
--device /dev/video0 \
--env DESKTOP_ENVIRONMENT_USER \
--env DISPLAY=:0 \
--group-add audio \
--group-add docker \
--group-add input \
--group-add tty \
--group-add video \
--hostname $DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME-$(hostname) \
@ -34,9 +33,8 @@ docker run \
--network host \
--rm \
--security-opt seccomp:$REPO_ROOT/docker/config/chrome/chrome.json \
--tty \
--volume /run/udev:/run/udev \
--volume /dev/shm:/dev/shm \
--volume /tmp/.X11-unix:/tmp/.X11-unix \
--volume /var/lib/docker:/var/lib/docker \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES:$DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES \