diff --git a/docker/scripts/LogBuildTime.sh b/docker/scripts/LogBuildTime.sh deleted file mode 100755 index ec5fcd0..0000000 --- a/docker/scripts/LogBuildTime.sh +++ /dev/null @@ -1,17 +0,0 @@ -REPO_ROOT=$(dirname $(readlink -f $0))/../.. - -# Export desktop environment shell configuration -eval "$($REPO_ROOT/docker/scripts/environment.sh)" - -# create logfile name -FILE_NAME=build-logs-$(date +%s).txt - -# do build and make timestamped logs -$REPO_ROOT/docker/scripts/build.sh | while read logline ; do echo "$(date +%s) | $logline"; done | tee -a $FILE_NAME - - - | awk -F, '{a=$1;next} {print $1-a}' output.txt -cat $REPO_ROOT/$FILE_NAME | grep -E '\[.{3,5}\]' | awk -F, '{a=$1;next} {$1=$1-a; print $0}' output.txt - - -tac $REPO_ROOT/$FILE_NAME | grep -E '\[.{3,5}\]' | grep -v 'name:' | awk '{if(x){t=x-$1}{x=$1;$1=t;print $1, $6,$7,$8,$9,$10}}' | tac diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh index d3c0f00..67f1cba 100755 --- a/docker/scripts/environment.sh +++ b/docker/scripts/environment.sh @@ -11,9 +11,6 @@ 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 @@ -43,7 +40,6 @@ 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 5fc8a9a..6f4590d 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/tty3 \ - --device /dev/vsock \ + --device /dev/video0 \ --env DESKTOP_ENVIRONMENT_USER \ --group-add audio \ --group-add docker \ @@ -54,7 +54,6 @@ 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 \