Browse code
Add Kitematic documentation to docs.master.docker.com
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Sven Dowideit authored on 2015/05/19 14:10:06Showing 3 changed files
| ... | ... |
@@ -10,6 +10,7 @@ ENV COMPOSE_BRANCH release |
| 10 | 10 |
ENV SWARM_BRANCH v0.2.0 |
| 11 | 11 |
ENV MACHINE_BRANCH docs |
| 12 | 12 |
ENV DISTRIB_BRANCH docs |
| 13 |
+ENV KITEMATIC_BRANCH master |
|
| 13 | 14 |
|
| 14 | 15 |
|
| 15 | 16 |
# TODO: need the full repo source to get the git version info |
| ... | ... |
@@ -116,5 +117,47 @@ ADD https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/inde
|
| 116 | 116 |
|
| 117 | 117 |
RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/*.md |
| 118 | 118 |
|
| 119 |
+####################### |
|
| 120 |
+# Kitematic |
|
| 121 |
+####################### |
|
| 122 |
+ADD https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/faq.md \
|
|
| 123 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/index.md \
|
|
| 124 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/known-issues.md \
|
|
| 125 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/minecraft-server.md \
|
|
| 126 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/nginx-web-server.md \
|
|
| 127 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/rethinkdb-dev-database.md \
|
|
| 128 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/userguide.md \
|
|
| 129 |
+ /docs/sources/kitematic/ |
|
| 130 |
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/kitematic/*.md |
|
| 131 |
+ADD https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/browse-images.png \
|
|
| 132 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/change-folder.png \
|
|
| 133 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-access-button.png \
|
|
| 134 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-redis-container.png \
|
|
| 135 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-terminal.png \
|
|
| 136 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/containers.png \
|
|
| 137 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/installing.png \
|
|
| 138 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-add-server.png \
|
|
| 139 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-create.png \
|
|
| 140 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-data-volume.png \
|
|
| 141 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-login.png \
|
|
| 142 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-map.png \
|
|
| 143 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-port.png \
|
|
| 144 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-restart.png \
|
|
| 145 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-server-address.png \
|
|
| 146 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-2048-files.png \
|
|
| 147 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-2048.png \
|
|
| 148 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-create.png \
|
|
| 149 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-data-folder.png \
|
|
| 150 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-data-volume.png \
|
|
| 151 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-hello-world.png \
|
|
| 152 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-preview.png \
|
|
| 153 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-serving-2048.png \
|
|
| 154 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-container.png \
|
|
| 155 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-create.png \
|
|
| 156 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-ports.png \
|
|
| 157 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethinkdb-preview.png \
|
|
| 158 |
+ https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/volumes-dir.png \
|
|
| 159 |
+ /docs/sources/kitematic/assets/ |
|
| 160 |
+ |
|
| 119 | 161 |
# Then build everything together, ready for mkdocs |
| 120 | 162 |
RUN /docs/build.sh |
| ... | ... |
@@ -33,6 +33,7 @@ pages: |
| 33 | 33 |
- ['installation/index.md', '**HIDDEN**'] |
| 34 | 34 |
- ['installation/ubuntulinux.md', 'Installation', 'Ubuntu'] |
| 35 | 35 |
- ['installation/mac.md', 'Installation', 'Mac OS X'] |
| 36 |
+- ['kitematic/index.md', 'Installation', 'Kitematic on OS X'] |
|
| 36 | 37 |
- ['installation/windows.md', 'Installation', 'Microsoft Windows'] |
| 37 | 38 |
- ['installation/testing-windows-docker-client.md', 'Installation', 'Building and testing the Windows Docker client'] |
| 38 | 39 |
- ['installation/amazon.md', 'Installation', 'Amazon EC2'] |
| ... | ... |
@@ -71,6 +72,7 @@ pages: |
| 71 | 71 |
- ['compose/extends.md', 'User Guide', ' ▪ Extend Compose services' ] |
| 72 | 72 |
- ['machine/index.md', 'User Guide', 'Docker Machine' ] |
| 73 | 73 |
- ['swarm/index.md', 'User Guide', 'Docker Swarm' ] |
| 74 |
+- ['kitematic/userguide.md', 'User Guide', 'Kitematic'] |
|
| 74 | 75 |
|
| 75 | 76 |
# Docker Hub docs: |
| 76 | 77 |
- ['docker-hub/index.md', 'Docker Hub', 'Docker Hub' ] |
| ... | ... |
@@ -103,6 +105,9 @@ pages: |
| 103 | 103 |
- ['compose/django.md', 'Examples', 'Getting started with Compose and Django'] |
| 104 | 104 |
- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails'] |
| 105 | 105 |
- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress'] |
| 106 |
+- ['kitematic/minecraft-server.md', 'Examples', 'Kitematic: Minecraft server'] |
|
| 107 |
+- ['kitematic/nginx-web-server.md', 'Examples', 'Kitematic: Ngnix web server'] |
|
| 108 |
+- ['kitematic/rethinkdb-dev-database.md', 'Examples', 'Kitematic: RethinkDB development database'] |
|
| 106 | 109 |
|
| 107 | 110 |
# Articles |
| 108 | 111 |
- ['articles/index.md', '**HIDDEN**'] |
| ... | ... |
@@ -180,6 +185,8 @@ pages: |
| 180 | 180 |
- ['reference/api/docker_remote_api_v1.0.md', '**HIDDEN**'] |
| 181 | 181 |
- ['reference/api/remote_api_client_libraries.md', 'Reference', 'Docker Remote API client libraries'] |
| 182 | 182 |
- ['reference/api/docker_io_accounts_api.md', 'Reference', 'Docker Hub accounts API'] |
| 183 |
+- ['kitematic/faq.md', 'Reference', 'Kitematic: FAQ'] |
|
| 184 |
+- ['kitematic/known-issues.md', 'Reference', 'Kitematic: Known issues'] |
|
| 183 | 185 |
|
| 184 | 186 |
# Hidden registry files |
| 185 | 187 |
- ['registry/storage-drivers/azure.md', '**HIDDEN**' ] |
| ... | ... |
@@ -8,14 +8,13 @@ You can install Docker using Boot2Docker to run `docker` commands at your comman |
| 8 | 8 |
Choose this installation if you are familiar with the command-line or plan to |
| 9 | 9 |
contribute to the Docker project on GitHub. |
| 10 | 10 |
|
| 11 |
+[<img src="/installation/images/kitematic.png" alt="Download Kitematic" |
|
| 12 |
+style="float:right;">](/kitematic/) |
|
| 13 |
+ |
|
| 11 | 14 |
Alternatively, you may want to try <a id="inlinelink" href="https://kitematic.com/" |
| 12 | 15 |
target="_blank">Kitematic</a>, an application that lets you set up Docker and |
| 13 | 16 |
run containers using a graphical user interface (GUI). |
| 14 | 17 |
|
| 15 |
-<a id="graphic" href="https://kitematic.com/" target="_blank"><img |
|
| 16 |
-src="/installation/images/kitematic.png" alt="Download Kitematic"></a> |
|
| 17 |
- |
|
| 18 |
- |
|
| 19 | 18 |
## Command-line Docker with Boot2Docker |
| 20 | 19 |
|
| 21 | 20 |
Because the Docker daemon uses Linux-specific kernel features, you can't run |