From ea30cd8cd28c337abbf92743f9017b8b8ecfc43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= Date: Fri, 9 Jun 2017 20:17:12 +0200 Subject: [PATCH 1/5] Create images.md Added some related articles to make the transition from Docker to Dokku easier to understand. --- docs/deployment/methods/images.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/deployment/methods/images.md b/docs/deployment/methods/images.md index f688f5544..aa1a555ef 100644 --- a/docs/deployment/methods/images.md +++ b/docs/deployment/methods/images.md @@ -162,3 +162,8 @@ docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker loa # tag and deploy the image ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest" ``` + +## Related articles +[Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md) +[Defining Environment Variables](/docs/configuration/environment-variables.md) +[Setting up the Ports](/docs/advanced-usage/proxy-management.md) From 65ebd9090396f773df2d53d439da57c1c702f414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= Date: Fri, 9 Jun 2017 20:17:44 +0200 Subject: [PATCH 2/5] Create images.md Fixing a little styling error (forgot to add list) --- docs/deployment/methods/images.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment/methods/images.md b/docs/deployment/methods/images.md index aa1a555ef..819070038 100644 --- a/docs/deployment/methods/images.md +++ b/docs/deployment/methods/images.md @@ -164,6 +164,6 @@ ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-a ``` ## Related articles -[Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md) -[Defining Environment Variables](/docs/configuration/environment-variables.md) -[Setting up the Ports](/docs/advanced-usage/proxy-management.md) +- [Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md) +- [Defining Environment Variables](/docs/configuration/environment-variables.md) +- [Setting up the Ports](/docs/advanced-usage/proxy-management.md) From f459745402b44dc6235efac343d5f31cf449d6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= Date: Fri, 9 Jun 2017 20:20:28 +0200 Subject: [PATCH 3/5] Update images.md Fixing Menu <--> Title mismatch. --- docs/deployment/methods/images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment/methods/images.md b/docs/deployment/methods/images.md index 819070038..13b18be7f 100644 --- a/docs/deployment/methods/images.md +++ b/docs/deployment/methods/images.md @@ -1,4 +1,4 @@ -# Image Tag Deployment +# Docker Image Deployment > New as of 0.4.0 From bec6c6bd66d57cd77060facac5588eb8b417f3de Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jun 2017 14:37:26 -0400 Subject: [PATCH 4/5] docs: fix header [ci skip] --- docs/deployment/methods/images.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/deployment/methods/images.md b/docs/deployment/methods/images.md index 13b18be7f..ddc81f9bd 100644 --- a/docs/deployment/methods/images.md +++ b/docs/deployment/methods/images.md @@ -1,4 +1,4 @@ -# Docker Image Deployment +# Docker Image Tag Deployment > New as of 0.4.0 @@ -158,12 +158,3 @@ Here's a more complete example using the above method: # build the image docker build -t dokku/test-app:v12 . # copy the image to the dokku host -docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load" -# tag and deploy the image -ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest" -``` - -## Related articles -- [Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md) -- [Defining Environment Variables](/docs/configuration/environment-variables.md) -- [Setting up the Ports](/docs/advanced-usage/proxy-management.md) From 1c6eacd75652e5f2fb3054dec98f28cd370a2c59 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jun 2017 14:38:14 -0400 Subject: [PATCH 5/5] docs: re-add new sections [ci skip] --- docs/deployment/methods/images.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/deployment/methods/images.md b/docs/deployment/methods/images.md index ddc81f9bd..b1973dcf9 100644 --- a/docs/deployment/methods/images.md +++ b/docs/deployment/methods/images.md @@ -158,3 +158,12 @@ Here's a more complete example using the above method: # build the image docker build -t dokku/test-app:v12 . # copy the image to the dokku host +docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load" +# tag and deploy the image +ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest" +``` + +## Related articles +- [Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md) +- [Defining Environment Variables](/docs/configuration/environment-variables.md) +- [Setting up the Ports](/docs/advanced-usage/proxy-management.md)