Skip to content

Commit a8c1fe3

Browse files
committed
Support rootless Docker for testing and linting
1 parent c2fe477 commit a8c1fe3

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

scripts/lint_in_docker.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22

33
# Run linter in Docker. Used in Makefile.
44

5+
if docker info --format '{{.SecurityOptions}}' | grep -q 'name=rootless'
6+
then
7+
USER_OPT=""
8+
else
9+
USER_OPT=--user="$(id -u):$(id -g)"
10+
fi
11+
512
# Indentation rules changed since 29.
613
for version in 30 29 # 28 27 26 25
714
do
815
docker \
916
run \
1017
--rm \
1118
--volume="$(pwd)":/src \
12-
--user="$(id -u):$(id -g)" \
19+
$USER_OPT \
1320
--workdir="/src" \
1421
--env=ELDEV_DIR=/src/.eldev \
1522
--env=HOME=/tmp \

scripts/test_in_docker.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
# Run tests in Docker. Used in Makefile.
44

5+
if docker info --format '{{.SecurityOptions}}' | grep -q 'name=rootless'
6+
then
7+
USER_OPT=""
8+
else
9+
USER_OPT=--user="$(id -u):$(id -g)"
10+
fi
11+
512
for version in 30 29 28 27 26 25
613
do
714
rm -f *.elc test/*.elc
@@ -10,7 +17,7 @@ do
1017
run \
1118
--rm \
1219
--volume="$(pwd)":/src \
13-
--user="$(id -u):$(id -g)" \
20+
$USER_OPT \
1421
--workdir="/src" \
1522
--env=ELDEV_DIR=/src/.eldev \
1623
--env=HOME=/tmp \

0 commit comments

Comments
 (0)