Browse Source

Adjust for storing script in / and not in path.

Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
pull/340/head
Dan Schaper 8 years ago
parent
commit
523db8b70a
No known key found for this signature in database GPG Key ID: FFF1A1AD0113C344
3 changed files with 11 additions and 7 deletions
  1. +1
    -2
      Dockerfile
  2. +3
    -3
      docker-entrypoint.sh
  3. +7
    -2
      getsslD

+ 1
- 2
Dockerfile View File

@ -5,8 +5,7 @@ RUN apk --no-cache --virtual .run-depends add \
curl \
openssl
COPY getsslD /usr/local/bin/getsslD
COPY getsslD /
WORKDIR /
COPY ./docker-entrypoint.sh /


+ 3
- 3
docker-entrypoint.sh View File

@ -1,12 +1,12 @@
#!/usr/bin/env bash
set -e
WORKING_DIR="/getsslD"
WORKING_DIR="/.getsslD"
cd $WORKING_DIR
if [ "$1" == "" ] && [ ! -f $WORKING_DIR/getsslD.cfg ]; then
echo "Type <getsslD -c DOMAIN> to initialize configuration files."
echo "Run with <-c DOMAIN> to initialize configuration files."
fi
getsslD --nocheck -w $WORKING_DIR "$@"
/getsslD -w $WORKING_DIR -d "$@"

+ 7
- 2
getsslD View File

@ -454,6 +454,11 @@ error_exit() { # give error message on error exit
exit 1
}
error() {
# Write error message to STDERR for log.
echo "$@" >&2
}
get_auth_dns() { # get the authoritative dns server for a domain (sets primary_ns )
gad_d="$1" # domain name
gad_s="$PUBLIC_DNS_SERVER" # start with PUBLIC_DNS_SERVER
@ -923,8 +928,7 @@ urlbase64() { # urlbase64: base64 encoded string with '+' replaced with '-' and
}
usage() { # echos out the program usage
echo "Usage: $PROGNAME [-h|--help] [-d|--debug] [-c|--create] [-f|--force] [-a|--all] [-q|--quiet]"\
"[-r|--revoke cert key] DOMAIN"
echo "Usage: $PROGNAME [options] [ARGS]"
}
write_domain_template() { # write out a template file for a domain.
@ -1096,6 +1100,7 @@ AGREEMENT=$(curl -I "${CA}/terms" 2>/dev/null | awk '$1 ~ "Location:" {print $2}
# if nothing in command line, print help and exit.
if [[ -z "$DOMAIN" ]] && [[ ${_CHECK_ALL} != "true" ]]; then
error "Domain is required for this option."
help_message
graceful_exit
fi


Loading…
Cancel
Save