diff --git a/scripts/base-container b/scripts/base-container index 24e6990..3686e98 100755 --- a/scripts/base-container +++ b/scripts/base-container @@ -8,11 +8,16 @@ 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 0af682f..bb20f60 100755 --- a/scripts/export-volume +++ b/scripts/export-volume @@ -16,8 +16,13 @@ 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 fb74c86..e08cc30 100755 --- a/scripts/import-volume +++ b/scripts/import-volume @@ -10,8 +10,13 @@ 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 025de9f..fcb888d 100755 --- a/scripts/jupyter-container +++ b/scripts/jupyter-container @@ -14,9 +14,14 @@ 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 73f4be5..9a3a836 100755 --- a/scripts/node-container +++ b/scripts/node-container @@ -15,6 +15,9 @@ 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 \ @@ -22,5 +25,6 @@ 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 cad88f5..9ad96e3 100755 --- a/scripts/php-container +++ b/scripts/php-container @@ -8,11 +8,16 @@ 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 82c8786..1f51d15 100755 --- a/scripts/python-container +++ b/scripts/python-container @@ -8,11 +8,16 @@ 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 ccc87a6..b85a00c 100755 --- a/scripts/vue-container +++ b/scripts/vue-container @@ -15,12 +15,16 @@ 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 \ + -p $port:$port \ + -u $userid:$usergroup \ -w /mnt \ git.janishutz.com/registry/dev-container-vue