Merge branch 'master' of github.com:dokku/dokku into feature-config-golang
This commit is contained in:
commit
6780d53c77
5 files changed
+7
-5
No files matched your search
@@ -1,4 +1,4 @@
|
|||||||
GO_REPO_ROOT := /go/src/github.com/dokku/dokku
|
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
|
.PHONY: build-in-docker build clean src-clean
|
||||||
@@ -35,7 +35,7 @@ After setting the desired options, proceed with the installation as described ab
|
|||||||
| Name | Type | Default | Description |
|
| Name | Type | Default | Description |
|
||||||
| ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ |
|
| ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ |
|
||||||
| dokku/web_config | boolean | true | Use web-based config for below options |
|
| dokku/web_config | boolean | true | Use web-based config for below options |
|
||||||
| dokku/vhost_enable | boolean | false | Use vhost-based deployments (e.g. <app>.dokku.me) |
|
| dokku/vhost_enable | boolean | false | Use vhost-based deployments (e.g., <app>.dokku.me) |
|
||||||
| dokku/hostname | string | dokku.me | Hostname, used as vhost domain and for showing app URL after deploy |
|
| 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`) |
|
| 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`) |
|
||||||
@@ -29,6 +29,8 @@ app_user_pre_deploy_trigger() {
|
|||||||
if [[ -n "$APP_PATHS" ]]; then
|
if [[ -n "$APP_PATHS" ]]; then
|
||||||
CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
|
CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
|
||||||
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
|
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
|
||||||
|
# strip --restart args from DOCKER_ARGS
|
||||||
|
DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM golang:1.7.5
|
FROM golang:1.9.1
|
||||||
|
|
||||||
EXPOSE 3000/tcp
|
EXPOSE 3000/tcp
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM golang:1.7.5
|
FROM golang:1.9.1
|
||||||
|
|
||||||
EXPOSE 3000/tcp
|
EXPOSE 3000/tcp
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user