diff --git a/runner/Dockerfile.dindrunner b/runner/Dockerfile.dindrunner index 6e196c1..8b3e071 100644 --- a/runner/Dockerfile.dindrunner +++ b/runner/Dockerfile.dindrunner @@ -100,8 +100,9 @@ RUN mkdir /opt/hostedtoolcache \ # We place the scripts in `/usr/bin` so that users who extend this image can # override them with scripts of the same name placed in `/usr/local/bin`. -COPY modprobe entrypoint.sh startup.sh logger.bash /usr/bin/ +COPY entrypoint.sh logger.bash startup.sh /usr/bin/ COPY supervisor/ /etc/supervisor/conf.d/ +RUN chmod +x /usr/bin/startup.sh /usr/bin/entrypoint.sh # arch command on OS X reports "i386" for Intel CPUs regardless of bitness RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ diff --git a/runner/modprobe b/runner/modprobe deleted file mode 100755 index 4d58c9d..0000000 --- a/runner/modprobe +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@"