From a5ac51491efa857e7ef56c5722dd3d9174ba96d3 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Sun, 6 Jun 2021 13:10:32 +0300 Subject: [PATCH 1/2] user entrypoint --- Dockerfile | 5 +++-- init.sh | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 init.sh diff --git a/Dockerfile b/Dockerfile index b400370..53770a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM registry.fedy95.com/baseimage-autossl:latest - ARG DOMAIN ARG GD_Key ARG GD_Secret RUN export ${GD_Key} && export ${GD_Secret} -RUN ["acme.sh", "--issue", "--dns", "dns_gd", "-d", "${DOMAIN}", "--reloadcmd", "'/usr/syno/sbin/synoservicecfg --reload httpd-sys'"] + +COPY init.sh . +ENTRYPOINT ["./init.sh"] diff --git a/init.sh b/init.sh new file mode 100755 index 0000000..6389a49 --- /dev/null +++ b/init.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +./acme.sh --issue --debug --dns dns_gd -d "${DOMAIN}" \ + --cert-file /usr/syno/etc/ssl/ssl.crt/server.crt \ + --key-file /usr/syno/etc/ssl/ssl.key/server.key \ + --reloadcmd '/usr/syno/sbin/synoservicecfg --reload httpd-sys' -- 2.30.2 From 332362d79476cd339e843837d4bd049439324c04 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Sun, 6 Jun 2021 13:15:14 +0300 Subject: [PATCH 2/2] fix volumes --- docker-compose.yml | 4 ++-- etc/instance/.gitignore | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 etc/instance/.gitignore diff --git a/docker-compose.yml b/docker-compose.yml index 2f718ef..af1b0ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,6 @@ services: env_file: env/instance.env volumes: - - ./etc/instance/server.crt:/usr/syno/etc/ssl/ssl.crt/server.crt - - ./etc/instance/server.key:/usr/syno/etc/ssl/ssl.crt/server.key + - /usr/syno/etc/ssl/ssl.crt:/usr/syno/etc/ssl/ssl.crt + - /usr/syno/etc/ssl/ssl.key:/usr/syno/etc/ssl/ssl.key ... diff --git a/etc/instance/.gitignore b/etc/instance/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/etc/instance/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore -- 2.30.2