diff --git a/docker/Dockerfile b/docker/Dockerfile index 9228006..e479a04 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -277,6 +277,10 @@ RUN curl -fsSL https://github.com/jesseduffield/lazydocker/releases/download/v0. RUN curl -fsSL https://github.com/jesseduffield/lazygit/releases/download/v0.8.1/lazygit_0.8.1_Linux_x86_64.tar.gz | \ tar -C /usr/local/bin -xzf - +# Intall microsoft teams +RUN wget -O MsTeams.deb https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.3.00.5153_amd64.deb && \ + apt install ./MsTeams.deb -q -y + # Install musikcube RUN wget -O musikcube.deb -nv https://github.com/clangen/musikcube/releases/download/0.90.0/musikcube_0.90.0_ubuntu_disco_amd64.deb && \ dpkg -i musikcube.deb || apt-get install -qq --fix-broken && \ @@ -337,11 +341,6 @@ RUN git clone --depth 1 https://github.com/tmux-plugins/tpm $HOME/.tmux/plugins/ # Install tmuxinator RUN gem install tmuxinator -v 1.1.5 -# Install unity - RUN wget -O /tmp/unity-setup -nv http://beta.unity3d.com/download/e025938fdedc/UnitySetup-2020.1.5f1 && \ - chmod +x /tmp/unity-setup && \ - yes | /tmp/unity-setup --components=Unity,Android,WebGL,Windows-Mono --install-location /opt/unity --unattended - # Install vs code, vs live share dependencies, and shfmt extension dependency RUN wget -O code.deb -nv https://go.microsoft.com/fwlink/?LinkID=760868 && \ apt-get install -qq ./code.deb && \ diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index 4b8c137..f10255c 100755 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -15,4 +15,5 @@ docker build \ --network host \ --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \ --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:latest \ + --progress plain \ $REPO_ROOT/docker diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index 6e9546c..d557459 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -9,6 +9,9 @@ echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_NA echo export DESKTOP_ENVIRONMENT_CONTAINER_TAG=${DESKTOP_ENVIRONMENT_CONTAINER_TAG-$(git --git-dir $REPO_ROOT/.git rev-parse --abbrev-ref HEAD)} echo export DESKTOP_ENVIRONMENT_REGISTRY=$DESKTOP_ENVIRONMENT_REGISTRY +# logged build info +echo export DOCKER_BUILDKIT=1 + # Desktop environment user configuration DESKTOP_ENVIRONMENT_USER_HOME=/home/$DESKTOP_ENVIRONMENT_USER echo export DESKTOP_ENVIRONMENT_USER=$DESKTOP_ENVIRONMENT_USER @@ -38,6 +41,7 @@ echo export DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_USER_HOME/. echo export DESKTOP_ENVIRONMENT_STATE_RESCUETIME=$DESKTOP_ENVIRONMENT_USER_HOME/.config/RescueTime.com echo export DESKTOP_ENVIRONMENT_STATE_SIGNAL=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Signal echo export DESKTOP_ENVIRONMENT_STATE_SLACK=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Slack +echo export DESKTOP_ENVIRONMENT_STATE_TEAMS=$DESKTOP_ENVIRONMENT_USER_HOME/.config/Microsoft/Microsoft\ Teams echo export DESKTOP_ENVIRONMENT_STATE_TELEGRAM=$DESKTOP_ENVIRONMENT_USER_HOME/.local/share/TelegramDesktop echo export DESKTOP_ENVIRONMENT_STATE_ZOOM=$DESKTOP_ENVIRONMENT_USER_HOME/.zoom diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh index 31e7d6c..c68e38d 100755 --- a/docker/scripts/start.sh +++ b/docker/scripts/start.sh @@ -18,7 +18,7 @@ docker run \ --device /dev/input \ --device /dev/snd \ --device /dev/tty2 \ - --device /dev/video0 \ + --device /dev/vsock \ --env DESKTOP_ENVIRONMENT_USER \ --env DISPLAY=:1 \ --group-add audio \ @@ -56,6 +56,7 @@ docker run \ --volume DESKTOP_ENVIRONMENT_STATE_RESCUETIME:$DESKTOP_ENVIRONMENT_STATE_RESCUETIME \ --volume DESKTOP_ENVIRONMENT_STATE_SIGNAL:$DESKTOP_ENVIRONMENT_STATE_SIGNAL \ --volume DESKTOP_ENVIRONMENT_STATE_SLACK:$DESKTOP_ENVIRONMENT_STATE_SLACK \ + --volume DESKTOP_ENVIRONMENT_STATE_TEAMS:$DESKTOP_ENVIRONMENT_STATE_TEAMS \ --volume DESKTOP_ENVIRONMENT_STATE_TELEGRAM:$DESKTOP_ENVIRONMENT_STATE_TELEGRAM \ --volume DESKTOP_ENVIRONMENT_STATE_ZOOM:$DESKTOP_ENVIRONMENT_STATE_ZOOM \ --volume DESKTOP_ENVIRONMENT_USER_DOCUMENTS:$DESKTOP_ENVIRONMENT_USER_DOCUMENTS \