From 8830e15526685e2e76eec11169b41e839818c06b Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 11 Jun 2019 18:03:21 -0700 Subject: [PATCH] use custom docker bin --- Dockerfile | 1 - docker/etc/my_init.d/10_dokku_init | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bc0ee4e8e..3dc52667a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM phusion/baseimage:0.11 CMD ["/sbin/my_init"] -ARG DOCKER_BIN=/usr/local/bin/docker ARG DOKKU_TAG=0.17.7 ARG DOKKU_GID=200 ARG DOKKU_UID=200 diff --git a/docker/etc/my_init.d/10_dokku_init b/docker/etc/my_init.d/10_dokku_init index 21c562149..7caff134b 100755 --- a/docker/etc/my_init.d/10_dokku_init +++ b/docker/etc/my_init.d/10_dokku_init @@ -44,6 +44,11 @@ main() { dokku --quiet domains:set-global "$DOKKU_HOSTNAME" fi + if [[ -x /usr/local/bin/docker ]]; then + mkdir -p /home/dokku/.dokkurc + echo "export DOCKER_BIN=/usr/local/bin/docker" >"/home/dokku/.dokkurc/DOCKER_BIN" + fi + if [[ ! -f /mnt/dokku/etc/nginx/dhparam.pem ]]; then mkdir -p /mnt/dokku/etc/nginx openssl dhparam -out /mnt/dokku/etc/nginx/dhparam.pem 2048