Merge pull request #1238 from drwetter/docker_minor

Docker minor
This commit is contained in:
Dirk Wetter 2019-04-17 08:16:06 +02:00 committed by GitHub
commit c74f253b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.9
RUN apk update && apk upgrade
RUN apk add bash procps drill git coreutils

View File

@ -18486,11 +18486,13 @@ create_cmd_line_string() {
check_base_requirements() {
local binary=''
local whitelist=' hexdump grep awk sed '
for binary in 'hexdump' 'dd' 'grep' 'awk' 'tr' 'sed' 'date' 'cat' 'ps' 'kill' 'head' 'tail' 'dirname'; do
for binary in 'hexdump' 'dd' 'grep' 'awk' 'tr' 'sed' 'wc' 'date' 'cat' 'ps' 'kill' 'head' 'tail' 'dirname'; do
if ! type -p "${binary}" &> /dev/null; then
fatal "You need to install ${binary} for this program to work" $ERR_RESOURCE
fi
[[ ${whitelist} =~ \ ${binary}\ ]] && continue
"${binary}" --help 2>&1 | grep -iq busybox
if [[ $? -eq 0 ]]; then
fatal "${binary} is from busybox. Please install a regular binary" $ERR_RESOURCE