Pass UID to Alpine container

2 files changed, 17 insertions, 4 deletions

diff --git a/.bashrc_local_home b/.bashrc_local_home
index e3b82df..288176b 100644
--- a/.bashrc_local_home
+++ b/.bashrc_local_home
@@ -31,6 +31,7 @@ function alpine-build
 
     docker run -ti --rm --detach-keys=ctrl-@ \
         --privileged \
+        -e ALPINE_UID=$UID \
         -v $HOME/bin:/opt/home-bin:ro \
         -v $HOME/.abuild:/abuild-keys:ro \
         -v $HOME/repos/alpine/aports:/aports \
diff --git a/bin/aport-bootstrap.sh b/bin/aport-bootstrap.sh
index dd09cfb..e14eeef 100755
--- a/bin/aport-bootstrap.sh
+++ b/bin/aport-bootstrap.sh
@@ -1,10 +1,22 @@
 #!/bin/sh
 
-# git-perl for add --interactive
-apk add alpine-sdk vim sudo atools spdx-licenses-list less git-perl linux-firmware-none
+[[ -z "$ALPINE_UID" ]] && ( echo "No ALPINE_UID set" && exit 1 )
 
-addgroup -g 1001 mcrute
-adduser -s /bin/sh -D -G mcrute -u 1001 mcrute
+# git-perl for add --interactive
+apk add \
+        alpine-sdk \
+        atools \
+        git-perl \
+        less \
+        linux-firmware-none \
+        shellcheck \
+        spdx-licenses-list \
+        sudo \
+        vim \
+        ;
+
+addgroup -g $ALPINE_UID mcrute
+adduser -s /bin/sh -D -G mcrute -u $ALPINE_UID mcrute
 addgroup mcrute wheel
 addgroup mcrute abuild