Merge branch 'master' into master
This commit is contained in:
commit
227e219f39
2 changed files with 5 additions and 5 deletions
|
@ -2,7 +2,7 @@ FROM python:3-alpine
|
||||||
|
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
RUN apk add --no-cache curl bash && curl https://raw.githubusercontent.com/christgau/wsdd/v0.5/src/wsdd.py -o wsdd.py && apk del curl
|
RUN apk add --no-cache curl bash && curl https://raw.githubusercontent.com/christgau/wsdd/v0.7.0/src/wsdd.py -o wsdd.py && apk del curl
|
||||||
|
|
||||||
copy docker-cmd.sh .
|
copy docker-cmd.sh .
|
||||||
|
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
args=( )
|
args=
|
||||||
|
|
||||||
if [ ! -z "${WSDD_ARGS}" ]; then
|
if [ ! -z "${WSDD_ARGS}" ]; then
|
||||||
args=${WSDD_ARGS}
|
args=${WSDD_ARGS}
|
||||||
else
|
else
|
||||||
if [ ! -z "${HOSTNAME}" ]; then
|
if [ ! -z "${HOSTNAME}" ]; then
|
||||||
args+=( "-n $HOSTNAME ")
|
args+="-n $HOSTNAME "
|
||||||
else
|
else
|
||||||
echo "HOSTNAME environment variable must be set."
|
echo "HOSTNAME environment variable must be set."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z "${WORKGROUP}" ]; then
|
if [ ! -z "${WORKGROUP}" ]; then
|
||||||
args+=( "-w $WORKGROUP " )
|
args+="-w $WORKGROUP "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -z "${DOMAIN}" ]; then
|
if [ ! -z "${DOMAIN}" ]; then
|
||||||
args+=( "-d $DOMAIN " )
|
args+="-d $DOMAIN "
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue