~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab81c00
)
fix docker volume read/write permission
author
hacknox
<hacknox@dotalive.org>
Thu, 2 Mar 2017 11:15:27 +0000
(19:15 +0800)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Sat, 15 Jul 2017 09:20:05 +0000
(11:20 +0200)
scripts/run-docker.sh
patch
|
blob
|
blame
|
history
diff --git
a/scripts/run-docker.sh
b/scripts/run-docker.sh
index
fcbe3da
..
d15cf3a
100755
(executable)
--- a/
scripts/run-docker.sh
+++ b/
scripts/run-docker.sh
@@
-1,9
+1,12
@@
#!/bin/sh
set -e -u
#!/bin/sh
set -e -u
+HOME=/home/builder
IMAGE_NAME=termux/package-builder
CONTAINER_NAME=termux-package-builder
IMAGE_NAME=termux/package-builder
CONTAINER_NAME=termux-package-builder
+[ `id -u` -eq 0 ] && USER=root || USER=builder
+
echo "Running container '$CONTAINER_NAME' from image '$IMAGE_NAME'..."
docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
echo "Running container '$CONTAINER_NAME' from image '$IMAGE_NAME'..."
docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
@@
-14,12
+17,17
@@
docker start $CONTAINER_NAME > /dev/null 2> /dev/null || {
--volume $PWD:/home/builder/termux-packages \
--tty \
$IMAGE_NAME
--volume $PWD:/home/builder/termux-packages \
--tty \
$IMAGE_NAME
+
+ echo "Changed builder uid/gid..."
+ docker exec $CONTAINER_NAME chown -R `id -u` /data >& /dev/null
+ docker exec $CONTAINER_NAME usermod -u `id -u` builder >& /dev/null
+ docker exec $CONTAINER_NAME groupmod -g `id -g` builder >& /dev/null
}
if [ "$#" -eq "0" ]; then
}
if [ "$#" -eq "0" ]; then
- docker exec --interactive --tty --user
builder
$CONTAINER_NAME bash
+ docker exec --interactive --tty --user
$USER
$CONTAINER_NAME bash
else
else
- docker exec --interactive --tty --user
builder
$CONTAINER_NAME $@
+ docker exec --interactive --tty --user
$USER
$CONTAINER_NAME $@
fi
fi