Add bash and find from findutils in order to avoid surprises from busybox

pull/39/head
Frank Denis 7 years ago
parent 74fb53de51
commit 6661b87530

@ -3,7 +3,7 @@ MAINTAINER Frank Denis
ENV SERIAL 1 ENV SERIAL 1
ENV BUILD_DEPS make gcc musl-dev git ldns-dev libevent-dev expat-dev shadow autoconf file libexecinfo-dev ENV BUILD_DEPS make gcc musl-dev git ldns-dev libevent-dev expat-dev shadow autoconf file libexecinfo-dev
ENV RUNTIME_DEPS libressl ldns ldns-tools libevent expat libtool libexecinfo coreutils drill ENV RUNTIME_DEPS libressl ldns ldns-tools libevent expat libtool libexecinfo coreutils drill findutils bash
RUN set -x && \ RUN set -x && \
apk --update upgrade && apk add $RUNTIME_DEPS $BUILD_DEPS apk --update upgrade && apk add $RUNTIME_DEPS $BUILD_DEPS

@ -1,17 +1,17 @@
#! /bin/sh #! /usr/bin/env bash
KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys" KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys"
STKEYS_DIR="${KEYS_DIR}/short-term" STKEYS_DIR="${KEYS_DIR}/short-term"
prune() { prune() {
find "$STKEYS_DIR" -type f -cmin +1440 -exec rm -f {} \; /usr/bin/find "$STKEYS_DIR" -type f -cmin +1440 -exec rm -f {} \;
} }
rotation_needed() { rotation_needed() {
if [ ! -f "${STKEYS_DIR}/dnscrypt.cert" ]; then if [ ! -f "${STKEYS_DIR}/dnscrypt.cert" ]; then
echo true echo true
else else
if [ $(find "$STKEYS_DIR" -type f -cmin -720 -print -quit | wc -l | sed 's/[^0-9]//g') -le 0 ]; then if [ $(/usr/bin/find "$STKEYS_DIR" -type f -cmin -720 -print -quit | wc -l | sed 's/[^0-9]//g') -le 0 ]; then
echo true echo true
else else
echo false echo false

@ -1,4 +1,4 @@
#! /bin/sh #! /usr/bin/env bash
set -e set -e

@ -1,4 +1,4 @@
#! /bin/sh #! /usr/bin/env bash
sleep 1800 sleep 1800
@ -6,7 +6,7 @@ KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys"
STKEYS_DIR="${KEYS_DIR}/short-term" STKEYS_DIR="${KEYS_DIR}/short-term"
rotation_needed() { rotation_needed() {
if [ $(find "$STKEYS_DIR" -type f -cmin -720 -print -quit | wc -l | sed 's/[^0-9]//g') -le 0 ]; then if [ $(/usr/bin/find "$STKEYS_DIR" -type f -cmin -720 -print -quit | wc -l | sed 's/[^0-9]//g') -le 0 ]; then
echo true echo true
else else
echo false echo false

@ -1,4 +1,4 @@
#! /bin/sh #! /usr/bin/env bash
drill -DQ -p 553 NS . @127.0.0.1 && \ drill -DQ -p 553 NS . @127.0.0.1 && \
drill -tDQ -p 553 NS . @127.0.0.1 drill -tDQ -p 553 NS . @127.0.0.1

@ -1,4 +1,4 @@
#! /bin/sh #! /usr/bin/env bash
KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys" KEYS_DIR="/opt/dnscrypt-wrapper/etc/keys"
ZONES_DIR="/opt/unbound/etc/unbound/zones" ZONES_DIR="/opt/unbound/etc/unbound/zones"

@ -1,4 +1,4 @@
#! /bin/sh #! /usr/bin/env bash
sleep 300 sleep 300

Loading…
Cancel
Save