summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-09-27 06:54:55 (GMT)
committerAlexey Neyman <stilor@att.net>2018-09-27 06:54:55 (GMT)
commitd573c1575825de8c47aaeca89db54226ff702924 (patch)
tree9be873831226a624216b0110f945d700b33771c9 /testing
parent29f0662c188e7126871fa84f6e6f854cda279c89 (diff)
Use 'chmod a-x' instead of 'chmod -x'
There is a subtle difference when executable bit is a part of the umask. And at least some versions (Debian/stretch) fail if the resulting mode would've been different if not for the umask setting. Fixes #998. Although, with such chmods/umasks it is likely that some package installation will break anyway. But I'll leave it until somebody complains. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'testing')
-rw-r--r--testing/docker/archlinux/Dockerfile2
-rwxr-xr-xtesting/docker/dmgr.sh2
-rw-r--r--testing/docker/gentoo-amd64/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/testing/docker/archlinux/Dockerfile b/testing/docker/archlinux/Dockerfile
index 4c90925..2ad9d64 100644
--- a/testing/docker/archlinux/Dockerfile
+++ b/testing/docker/archlinux/Dockerfile
@@ -1,3 +1,3 @@
-FROM hoverbear/archlinux
+FROM base/archlinux:latest
RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm base-devel git help2man python unzip
diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh
index 0824784..b6a4294 100755
--- a/testing/docker/dmgr.sh
+++ b/testing/docker/dmgr.sh
@@ -109,7 +109,7 @@ action_clean()
msg "Cleaning up after ${cntr}"
if [ -d build-${cntr} ]; then
- chmod -R +w build-${cntr}
+ chmod -R a+w build-${cntr}
rm -rf build-${cntr}
fi
}
diff --git a/testing/docker/gentoo-amd64/Dockerfile b/testing/docker/gentoo-amd64/Dockerfile
index 6500564..455e315 100644
--- a/testing/docker/gentoo-amd64/Dockerfile
+++ b/testing/docker/gentoo-amd64/Dockerfile
@@ -1,4 +1,4 @@
FROM gentoo/stage3-amd64-hardened
RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64
-RUN chmod +x /sbin/dumb-init
+RUN chmod a+x /sbin/dumb-init
ENTRYPOINT [ "/sbin/dumb-init", "--" ]