diff --git a/scripts/base-container b/scripts/base-container index 3686e98..24e6990 100755 --- a/scripts/base-container +++ b/scripts/base-container @@ -8,16 +8,11 @@ echo " => Starting container " -userid=$(id -u) -usergroup=$(id -g) - - docker run -it \ -v $mount:/mnt \ -v ~/.config/fish:/root/.config/fish \ -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ --name $name \ --hostname jh-dev-container-$name \ - -u $userid:$usergroup \ -w /mnt \ git.janishutz.com/registry/dev-container-base diff --git a/scripts/export-volume b/scripts/export-volume index bb20f60..0af682f 100755 --- a/scripts/export-volume +++ b/scripts/export-volume @@ -16,13 +16,8 @@ echo " => Exporting... " -userid=$(id -u) -usergroup=$(id -g) - - docker run --rm \ -v $volume_name:/data \ -v $save_path:/backup \ - -u $userid:$usergroup \ archlinux \ tar -czf /backup/export.tar.gz -C /data ./ diff --git a/scripts/import-volume b/scripts/import-volume index e08cc30..fb74c86 100755 --- a/scripts/import-volume +++ b/scripts/import-volume @@ -10,13 +10,8 @@ fi save_path=$([[ $2 ]] && echo $2 || echo "./export") -userid=$(id -u) -usergroup=$(id -g) - - docker run --rm \ -v $volume_name:/data \ -v $save_path:/backup \ - -u $userid:$usergroup \ archlinux \ bash -c "tar -xf /backup/export.tar.gz -C /data && ls /data" diff --git a/scripts/jupyter-container b/scripts/jupyter-container index fcb888d..025de9f 100755 --- a/scripts/jupyter-container +++ b/scripts/jupyter-container @@ -14,14 +14,9 @@ echo " => Starting container " -userid=$(id -u) -usergroup=$(id -g) - - docker run \ -v $mount:/home/jovyan/work \ --name $name \ -p $port:8888 \ - -u $userid:$usergroup \ -e DOCKER_STACKS_JUPYTER_CMD=notebook \ quay.io/jupyter/base-notebook diff --git a/scripts/node-container b/scripts/node-container index 9a3a836..73f4be5 100755 --- a/scripts/node-container +++ b/scripts/node-container @@ -15,9 +15,6 @@ echo " => Port $port the same internally and externally " -userid=$(id -u) -usergroup=$(id -g) - docker run -it \ -v $mount:/mnt \ -v ~/.config/fish:/root/.config/fish \ @@ -25,6 +22,5 @@ docker run -it \ --name $name \ --hostname jh-dev-container-$name \ -p $port:$port \ - -u $userid:$usergroup \ -w /mnt \ git.janishutz.com/registry/dev-container-npm diff --git a/scripts/php-container b/scripts/php-container index 9ad96e3..cad88f5 100755 --- a/scripts/php-container +++ b/scripts/php-container @@ -8,16 +8,11 @@ echo " => Starting container " -userid=$(id -u) -usergroup=$(id -g) - - docker run -it \ -v $mount:/mnt \ -v ~/.config/fish:/root/.config/fish \ -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ --name $name \ --hostname jh-dev-container-$name \ - -u $userid:$usergroup \ -w /mnt \ git.janishutz.com/registry/dev-container-php diff --git a/scripts/python-container b/scripts/python-container index 1f51d15..82c8786 100755 --- a/scripts/python-container +++ b/scripts/python-container @@ -8,16 +8,11 @@ echo " => Starting container " -userid=$(id -u) -usergroup=$(id -g) - - docker run -it \ -v $mount:/mnt \ -v ~/.config/fish:/root/.config/fish \ -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ --name $name \ --hostname jh-dev-container-$name \ - -u $userid:$usergroup \ -w /mnt \ git.janishutz.com/registry/dev-container-python diff --git a/scripts/vue-container b/scripts/vue-container index b85a00c..ccc87a6 100755 --- a/scripts/vue-container +++ b/scripts/vue-container @@ -15,16 +15,12 @@ echo " => Port $port the same internally and externally " -userid=$(id -u) -usergroup=$(id -g) - docker run -it \ -v $mount:/mnt \ -v ~/.config/fish:/root/.config/fish \ -v ~/projects/system/dotfiles/scripts/:/root/projects/system/dotfiles \ --name $name \ --hostname jh-dev-container-$name \ - -p $port:$port \ - -u $userid:$usergroup \ + -p $port:$port \ -w /mnt \ git.janishutz.com/registry/dev-container-vue