maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-25 22:27:20 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

name-to-image

Browse source
This commit is contained in:
Jackson Delahunt 2020-09-12 02:25:45 +10:00
parent 21be0325a4
commit 9ca81fe84a
11 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/Dockerfile
View file

@ -38,7 +38,7 @@ RUN locale-gen $LANG && \
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
echo $TZ > /etc/timezone
# Install cloud computer utilities
# Install desktop environment utilities
RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get install -qq --fix-missing \
alsa-utils \

4
docker/scripts/build.sh
View file

@ -13,6 +13,6 @@ docker build \
--build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
--file $REPO_ROOT/docker/Dockerfile \
--network host \
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:latest \
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:latest \
$REPO_ROOT/docker

8
docker/scripts/environment.sh
View file

@ -1,11 +1,13 @@
REPO_ROOT=$(dirname $(readlink -f $0))/../..
DESKTOP_ENVIRONMENT_USER=$USER
DESKTOP_ENVIRONMENT_CONTAINER_NAME=desktop-environment
DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=desktop-environment
DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_NAME-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE}
DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_USER}
# Desktop environment repository information
echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_NAME
echo export DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
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
@ -16,7 +18,7 @@ echo export DESKTOP_ENVIRONMENT_USER_HOME=$DESKTOP_ENVIRONMENT_USER_HOME
echo export DESKTOP_ENVIRONMENT_USER_ID=1000
# Desktop environment docker configuration
echo export DESKTOP_ENVIRONMENT_DOCKER_NETWORK=$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
echo export DESKTOP_ENVIRONMENT_DOCKER_NETWORK=$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
# Desktop environment application cache volumes
echo export DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/google-chrome

2
docker/scripts/exec-root.sh
View file

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

2
docker/scripts/exec.sh
View file

@ -7,4 +7,4 @@ docker exec \
--interactive \
--tty \
--user $DESKTOP_ENVIRONMENT_USER \
$DESKTOP_ENVIRONMENT_CONTAINER_NAME zsh -c "$*"
$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*"

2
docker/scripts/kill-all.sh
View file

@ -5,7 +5,7 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
# Remove all non desktop environment containers
docker ps -a | \
grep -v " $DESKTOP_ENVIRONMENT_CONTAINER_NAME" | \
grep -v " $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE" | \
grep -v "CONTAINER " | \
cut -b 1-20 | \
xargs docker rm -f

2
docker/scripts/push.sh
View file

@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Export desktop environment shell configuration
eval "$($REPO_ROOT/docker/scripts/environment.sh)"
docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG
docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG

2
docker/scripts/start.sh
View file

@ -67,7 +67,7 @@ docker run \
--volume DESKTOP_ENVIRONMENT_USER_TORRENTS:$DESKTOP_ENVIRONMENT_USER_TORRENTS \
--volume DESKTOP_ENVIRONMENT_USER_VIDEOS:$DESKTOP_ENVIRONMENT_USER_VIDEOS \
--workdir $DESKTOP_ENVIRONMENT_USER_HOME \
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
sleep infinity
# Wait until the desktop environment container is running before proceeding

2
docker/scripts/stop.sh
View file

@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
# Export desktop environment shell configuration
eval "$($REPO_ROOT/docker/scripts/environment.sh)"
docker rm -f $DESKTOP_ENVIRONMENT_CONTAINER_NAME
docker rm -f $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE

2
docker/scripts/test.sh
View file

@ -14,7 +14,7 @@ docker run \
--rm \
--user $DESKTOP_ENVIRONMENT_USER \
--workdir $DESKTOP_ENVIRONMENT_USER_HOME \
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
sleep infinity
# Wait until the desktop environment container is running before proceeding

2
docker/scripts/tmux.sh
View file

@ -7,7 +7,7 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
docker exec \
--interactive \
--tty \
$DESKTOP_ENVIRONMENT_CONTAINER_NAME \
$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE \
tmux new-session \
-s desktop-environment-shell-$(date +%s) \
-t desktop-environment-shell