From f2ec959598f9b5a7945abe842e3fbbce4fcf2e71 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 9 Oct 2017 15:33:09 -0700 Subject: [PATCH 1/3] strip restart flag from app_user_pre_deploy_trigger --- plugins/00_dokku-standard/pre-deploy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/00_dokku-standard/pre-deploy b/plugins/00_dokku-standard/pre-deploy index c78257140..74df3a5aa 100755 --- a/plugins/00_dokku-standard/pre-deploy +++ b/plugins/00_dokku-standard/pre-deploy @@ -28,6 +28,8 @@ app_user_pre_deploy_trigger() { if [[ -n "$APP_PATHS" ]]; then CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs) DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" | xargs) + # strip --restart args from DOCKER_ARGS + DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS") fi if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then From dc79152fe03348c6250d050b5c6d76d1989b6d5f Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 10 Oct 2017 08:13:59 -0700 Subject: [PATCH 2/3] upgrade to golang 1.9.1 --- common.mk | 2 +- tests/apps/go-fail-postdeploy/Dockerfile | 2 +- tests/apps/go-fail-predeploy/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index 8b8f02501..d8e5475eb 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ GO_REPO_ROOT := /go/src/github.com/dokku/dokku -BUILD_IMAGE := golang:1.7.5 +BUILD_IMAGE := golang:1.9.1 .PHONY: build-in-docker build clean src-clean diff --git a/tests/apps/go-fail-postdeploy/Dockerfile b/tests/apps/go-fail-postdeploy/Dockerfile index 9e748affb..b59544951 100644 --- a/tests/apps/go-fail-postdeploy/Dockerfile +++ b/tests/apps/go-fail-postdeploy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.5 +FROM golang:1.9.1 EXPOSE 3000/tcp diff --git a/tests/apps/go-fail-predeploy/Dockerfile b/tests/apps/go-fail-predeploy/Dockerfile index 9e748affb..b59544951 100644 --- a/tests/apps/go-fail-predeploy/Dockerfile +++ b/tests/apps/go-fail-predeploy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.5 +FROM golang:1.9.1 EXPOSE 3000/tcp From 58e36fee10a2444fc0174f4e4f25b94ee044f7c0 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Sun, 15 Oct 2017 13:54:13 +0300 Subject: [PATCH 3/3] Fix syntax typo in debian.md [ci skip] --- docs/getting-started/install/debian.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started/install/debian.md b/docs/getting-started/install/debian.md index 50f486da8..07a0da22d 100644 --- a/docs/getting-started/install/debian.md +++ b/docs/getting-started/install/debian.md @@ -35,7 +35,7 @@ After setting the desired options, proceed with the installation as described ab | Name | Type | Default | Description | | ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ | | dokku/web_config | boolean | true | Use web-based config for below options | -| dokku/vhost_enable | boolean | false | Use vhost-based deployments (e.g. .dokku.me) | +| dokku/vhost_enable | boolean | false | Use vhost-based deployments (e.g., .dokku.me) | | dokku/hostname | string | dokku.me | Hostname, used as vhost domain and for showing app URL after deploy | -| dokku/skip_key_file| boolean | false | Don't check for the existence of the dokku/key_file. Warning: This setting this to true, will require you to manually add an SSH key later on. | +| dokku/skip_key_file| boolean | false | Don't check for the existence of the dokku/key_file. Warning: Setting this to true, will require you to manually add an SSH key later on. | | dokku/key_file | string | /root/.ssh/id_rsa.pub | Path on disk to an SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |