Merge branch 'dev' of https://github.com/acmesh-official/acme.sh into dev

[mirror_acme.sh.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 68385d7d8be6385663cedb7bc2b56c2c43a7f778..4618efaf7090a315a0f618b375f1226e5389dd3d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,25 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN apk update -f \
   && apk --no-cache add -f \
   openssl \
+  openssh-client \
   coreutils \
   bind-tools \
   curl \
+  sed \
   socat \
   tzdata \
+  oath-toolkit-oathtool \
+  tar \
+  libidn \
   && rm -rf /var/cache/apk/*
 
 ENV LE_CONFIG_HOME /acme.sh
 
-ENV AUTO_UPGRADE 1
+ARG AUTO_UPGRADE=1
+
+ENV AUTO_UPGRADE $AUTO_UPGRADE
 
 #Install
 ADD ./ /install_acme.sh/
@@ -21,7 +28,7 @@ RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/
 
 RUN ln -s  /root/.acme.sh/acme.sh  /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null##' | crontab -
 
-RUN for verb in help \ 
+RUN for verb in help \
   version \
   install \
   uninstall \
@@ -48,6 +55,8 @@ RUN for verb in help \
   createCSR \
   deactivate \
   deactivate-account \
+  set-notify \
+  set-default-ca \
   ; do \
     printf -- "%b" "#!/usr/bin/env sh\n/root/.acme.sh/acme.sh --${verb} --config-home /acme.sh \"\$@\"" >/usr/local/bin/--${verb} && chmod +x /usr/local/bin/--${verb} \
   ; done