From 65ec3a37630560f27f8c168d970e9e19fcfa6720 Mon Sep 17 00:00:00 2001 From: "Benjamin R. Haskell" Date: Fri, 7 Oct 2016 00:45:16 -0400 Subject: [PATCH] Revert pull request #48 Reverts commit b3a620808a44d294a8fdee4de9bf6e5a577e8d76 in order to replace it with more-targeted blocks. --- apidocs/cloud-api-source/source/includes/node.md | 4 ---- apidocs/cloud-api-source/source/includes/stack.md | 4 ---- engine/admin/formatting.md | 4 ---- engine/admin/logging/fluentd.md | 4 ---- engine/admin/logging/log_tags.md | 4 ---- engine/admin/logging/overview.md | 4 ---- engine/admin/logging/splunk.md | 4 ---- engine/deprecated.md | 4 ---- engine/reference/api/docker_remote_api_v1.18.md | 4 ---- engine/reference/api/docker_remote_api_v1.19.md | 4 ---- engine/reference/api/docker_remote_api_v1.20.md | 4 ---- engine/reference/api/docker_remote_api_v1.21.md | 4 ---- engine/reference/api/docker_remote_api_v1.22.md | 4 ---- engine/reference/api/docker_remote_api_v1.23.md | 4 ---- engine/reference/api/docker_remote_api_v1.24.md | 4 ---- engine/reference/api/docker_remote_api_v1.25.md | 4 ---- engine/reference/commandline/cli.md | 4 ---- engine/reference/commandline/commit.md | 4 ---- engine/reference/commandline/images.md | 4 ---- engine/reference/commandline/inspect.md | 4 ---- engine/reference/commandline/node_inspect.md | 4 ---- engine/reference/commandline/ps.md | 4 ---- engine/reference/commandline/service_inspect.md | 4 ---- engine/reference/commandline/version.md | 4 ---- engine/reference/commandline/volume_inspect.md | 4 ---- engine/reference/run.md | 4 ---- engine/swarm/admin_guide.md | 4 ---- engine/swarm/ingress.md | 4 ---- engine/swarm/networking.md | 4 ---- engine/tutorials/networkingcontainers.md | 4 ---- engine/tutorials/usingdocker.md | 4 ---- engine/userguide/networking/default_network/dockerlinks.md | 4 ---- engine/userguide/networking/work-with-networks.md | 4 ---- machine/reference/inspect.md | 4 ---- machine/reference/ls.md | 4 ---- 35 files changed, 140 deletions(-) diff --git a/apidocs/cloud-api-source/source/includes/node.md b/apidocs/cloud-api-source/source/includes/node.md index df2396dddf..048440930a 100644 --- a/apidocs/cloud-api-source/source/includes/node.md +++ b/apidocs/cloud-api-source/source/includes/node.md @@ -1,5 +1,3 @@ -{% raw %} - # Nodes ## Node @@ -376,5 +374,3 @@ Available in Docker Cloud's **REST API** Parameter | Description --------- | ----------- uuid | The UUID of the node to terminate - -{% endraw %} diff --git a/apidocs/cloud-api-source/source/includes/stack.md b/apidocs/cloud-api-source/source/includes/stack.md index e8474148ae..3ea9afb7c9 100644 --- a/apidocs/cloud-api-source/source/includes/stack.md +++ b/apidocs/cloud-api-source/source/includes/stack.md @@ -1,5 +1,3 @@ -{% raw %} - # Stacks ## Stack @@ -568,5 +566,3 @@ Available in Docker Cloud's **REST API** Parameter | Description --------- | ----------- uuid | The UUID of the stack to terminate - -{% endraw %} diff --git a/engine/admin/formatting.md b/engine/admin/formatting.md index be15f55608..f927b46abb 100644 --- a/engine/admin/formatting.md +++ b/engine/admin/formatting.md @@ -9,8 +9,6 @@ menu: title: Format command and log output --- -{% raw %} - # Formatting reference Docker uses [Go templates](https://golang.org/pkg/text/template/) to allow users manipulate the output format @@ -66,5 +64,3 @@ Title capitalizes a string. Upper turns a string into its upper case representation. $ docker inspect --format "{{upper .Name}}" container - -{% endraw %} diff --git a/engine/admin/logging/fluentd.md b/engine/admin/logging/fluentd.md index d602931c22..6c9ab1b4f6 100644 --- a/engine/admin/logging/fluentd.md +++ b/engine/admin/logging/fluentd.md @@ -10,8 +10,6 @@ menu: title: Fluentd logging driver --- -{% raw %} - # Fluentd logging driver The `fluentd` logging driver sends container logs to the @@ -115,5 +113,3 @@ aggregate store. 3. Start one or more containers with the `fluentd` logging driver: $ docker run --log-driver=fluentd your/application - -{% endraw %} diff --git a/engine/admin/logging/log_tags.md b/engine/admin/logging/log_tags.md index 4c1af249a1..6276344e03 100644 --- a/engine/admin/logging/log_tags.md +++ b/engine/admin/logging/log_tags.md @@ -11,8 +11,6 @@ menu: title: Log tags for logging driver --- -{% raw %} - # Log Tags The `tag` log option specifies how to format a tag that identifies the @@ -68,5 +66,3 @@ Apr 1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: + exec app Apr 1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: 2016-04-01 15:22:17.075416751 +0000 UTC stderr msg: 1 ``` - -{% endraw %} diff --git a/engine/admin/logging/overview.md b/engine/admin/logging/overview.md index 49ff35c6d0..8790c2a2b1 100644 --- a/engine/admin/logging/overview.md +++ b/engine/admin/logging/overview.md @@ -11,8 +11,6 @@ menu: title: Configuring Logging Drivers --- -{% raw %} - # Configure logging drivers The container can have a different logging driver than the Docker daemon. Use @@ -307,5 +305,3 @@ The Google Cloud Logging driver supports the following options: For detailed information about working with this logging driver, see the [Google Cloud Logging driver](gcplogs.md). reference documentation. - -{% endraw %} diff --git a/engine/admin/logging/splunk.md b/engine/admin/logging/splunk.md index 715aa38876..c246331e1e 100644 --- a/engine/admin/logging/splunk.md +++ b/engine/admin/logging/splunk.md @@ -10,8 +10,6 @@ menu: title: Splunk logging driver --- -{% raw %} - # Splunk logging driver The `splunk` logging driver sends container logs to @@ -69,5 +67,3 @@ The `SplunkServerDefaultCert` is automatically generated by Splunk certificates. --env "TEST=false" --label location=west your/application - -{% endraw %} diff --git a/engine/deprecated.md b/engine/deprecated.md index 6b25d2f55b..168344ca74 100644 --- a/engine/deprecated.md +++ b/engine/deprecated.md @@ -11,8 +11,6 @@ menu: title: Deprecated Engine Features --- -{% raw %} - # Deprecated Engine Features The following list of features are deprecated in Engine. @@ -189,5 +187,3 @@ Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the - DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE is now named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE - DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE is now named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.18.md b/engine/reference/api/docker_remote_api_v1.18.md index 663bea87e0..fcc6a4b591 100644 --- a/engine/reference/api/docker_remote_api_v1.18.md +++ b/engine/reference/api/docker_remote_api_v1.18.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.18 --- -{% raw %} - # Docker Remote API v1.18 ## 1. Brief introduction @@ -2135,5 +2133,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.19.md b/engine/reference/api/docker_remote_api_v1.19.md index e6c5c39e71..6b5a5db9c0 100644 --- a/engine/reference/api/docker_remote_api_v1.19.md +++ b/engine/reference/api/docker_remote_api_v1.19.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.19 --- -{% raw %} - # Docker Remote API v1.19 ## 1. Brief introduction @@ -2215,5 +2213,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.20.md b/engine/reference/api/docker_remote_api_v1.20.md index bb33b0548f..592c7ab2a1 100644 --- a/engine/reference/api/docker_remote_api_v1.20.md +++ b/engine/reference/api/docker_remote_api_v1.20.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.20 --- -{% raw %} - # Docker Remote API v1.20 ## 1. Brief introduction @@ -2366,5 +2364,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.21.md b/engine/reference/api/docker_remote_api_v1.21.md index 1c53016903..f1de122747 100644 --- a/engine/reference/api/docker_remote_api_v1.21.md +++ b/engine/reference/api/docker_remote_api_v1.21.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.21 --- -{% raw %} - # Docker Remote API v1.21 ## 1. Brief introduction @@ -2937,5 +2935,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.22.md b/engine/reference/api/docker_remote_api_v1.22.md index 263f6b3ce3..235157c7d9 100644 --- a/engine/reference/api/docker_remote_api_v1.22.md +++ b/engine/reference/api/docker_remote_api_v1.22.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.22 --- -{% raw %} - # Docker Remote API v1.22 ## 1. Brief introduction @@ -3273,5 +3271,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.23.md b/engine/reference/api/docker_remote_api_v1.23.md index 123427392f..c7118f0d0c 100644 --- a/engine/reference/api/docker_remote_api_v1.23.md +++ b/engine/reference/api/docker_remote_api_v1.23.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.23 --- -{% raw %} - # Docker Remote API v1.23 ## 1. Brief introduction @@ -3389,5 +3387,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.24.md b/engine/reference/api/docker_remote_api_v1.24.md index a5c1581b50..1d9fe1c7a0 100644 --- a/engine/reference/api/docker_remote_api_v1.24.md +++ b/engine/reference/api/docker_remote_api_v1.24.md @@ -9,8 +9,6 @@ menu: title: Remote API v1.24 --- -{% raw %} - # Docker Remote API v1.24 # 1. Brief introduction @@ -5247,5 +5245,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/api/docker_remote_api_v1.25.md b/engine/reference/api/docker_remote_api_v1.25.md index bf94982c14..1cd58ac86e 100644 --- a/engine/reference/api/docker_remote_api_v1.25.md +++ b/engine/reference/api/docker_remote_api_v1.25.md @@ -10,8 +10,6 @@ menu: title: Remote API v1.25 --- -{% raw %} - # Docker Remote API v1.25 # 1. Brief introduction @@ -5283,5 +5281,3 @@ To set cross origin requests to the remote api please give values to default or blank means CORS disabled $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar" - -{% endraw %} diff --git a/engine/reference/commandline/cli.md b/engine/reference/commandline/cli.md index 730866da1c..f4b685afd6 100644 --- a/engine/reference/commandline/cli.md +++ b/engine/reference/commandline/cli.md @@ -9,8 +9,6 @@ menu: title: Use the Docker command line --- -{% raw %} - # Use the Docker command line To list available commands, either run `docker` with no parameters @@ -224,5 +222,3 @@ Sometimes, multiple options can call for a more complex value string as for Options like `--name=""` expect a string, and they can only be specified once. Options like `-c=0` expect an integer, and they can only be specified once. - -{% endraw %} diff --git a/engine/reference/commandline/commit.md b/engine/reference/commandline/commit.md index bcd786a4fb..45a39ba69a 100644 --- a/engine/reference/commandline/commit.md +++ b/engine/reference/commandline/commit.md @@ -8,8 +8,6 @@ menu: title: commit --- -{% raw %} - # commit ```markdown @@ -86,5 +84,3 @@ created. Supported `Dockerfile` instructions: 89373736e2e7 testimage:version4 "apachectl -DFOREGROU" 3 seconds ago Up 2 seconds 80/tcp c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours - -{% endraw %} diff --git a/engine/reference/commandline/images.md b/engine/reference/commandline/images.md index 026d16754a..fb5252f6cd 100644 --- a/engine/reference/commandline/images.md +++ b/engine/reference/commandline/images.md @@ -8,8 +8,6 @@ menu: title: images --- -{% raw %} - # images ```markdown @@ -276,5 +274,3 @@ can use: 746b819f315e postgres 9.3 746b819f315e postgres 9.3.5 746b819f315e postgres latest - -{% endraw %} diff --git a/engine/reference/commandline/inspect.md b/engine/reference/commandline/inspect.md index 43a937d25b..55bc7c4210 100644 --- a/engine/reference/commandline/inspect.md +++ b/engine/reference/commandline/inspect.md @@ -8,8 +8,6 @@ menu: title: inspect --- -{% raw %} - # inspect ```markdown @@ -82,5 +80,3 @@ Docker adds a template function, `json`, which can be applied to get results in JSON format. $ docker inspect --format='{{json .Config}}' $INSTANCE_ID - -{% endraw %} diff --git a/engine/reference/commandline/node_inspect.md b/engine/reference/commandline/node_inspect.md index 2037ae76f6..aff088bf0f 100644 --- a/engine/reference/commandline/node_inspect.md +++ b/engine/reference/commandline/node_inspect.md @@ -8,8 +8,6 @@ menu: title: node inspect --- -{% raw %} - **Warning:** this command is part of the Swarm management feature introduced in Docker 1.12, and might be subject to non backward-compatible changes. # node inspect @@ -128,5 +126,3 @@ Example output: * [node ps](node_ps.md) * [node ls](node_ls.md) * [node rm](node_rm.md) - -{% endraw %} diff --git a/engine/reference/commandline/ps.md b/engine/reference/commandline/ps.md index d8070a0440..818f4deba5 100644 --- a/engine/reference/commandline/ps.md +++ b/engine/reference/commandline/ps.md @@ -8,8 +8,6 @@ menu: title: ps --- -{% raw %} - # ps ```markdown @@ -369,5 +367,3 @@ a87ecb4f327c com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd c1d3b0166030 com.docker.swarm.node=debian,com.docker.swarm.cpu=6 41d50ecd2f57 com.docker.swarm.node=fedora,com.docker.swarm.cpu=3,com.docker.swarm.storage=ssd ``` - -{% endraw %} diff --git a/engine/reference/commandline/service_inspect.md b/engine/reference/commandline/service_inspect.md index 54b19693dd..195426b0c4 100644 --- a/engine/reference/commandline/service_inspect.md +++ b/engine/reference/commandline/service_inspect.md @@ -8,8 +8,6 @@ menu: title: service inspect --- -{% raw %} - **Warning:** this command is part of the Swarm management feature introduced in Docker 1.12, and might be subject to non backward-compatible changes. # service inspect @@ -155,5 +153,3 @@ $ docker service inspect --format='{{.Spec.Mode.Replicated.Replicas}}' redis * [service scale](service_scale.md) * [service ps](service_ps.md) * [service update](service_update.md) - -{% endraw %} diff --git a/engine/reference/commandline/version.md b/engine/reference/commandline/version.md index 862eda73a9..bbccec9c1a 100644 --- a/engine/reference/commandline/version.md +++ b/engine/reference/commandline/version.md @@ -8,8 +8,6 @@ menu: title: version --- -{% raw %} - # version ```markdown @@ -58,5 +56,3 @@ describes all the details of the format. $ docker version --format '{{json .}}' {"Client":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"},"ServerOK":true,"Server":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","KernelVersion":"3.13.2-gentoo","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"}} - -{% endraw %} diff --git a/engine/reference/commandline/volume_inspect.md b/engine/reference/commandline/volume_inspect.md index 82257d8d5e..5539a3af6a 100644 --- a/engine/reference/commandline/volume_inspect.md +++ b/engine/reference/commandline/volume_inspect.md @@ -8,8 +8,6 @@ menu: title: volume inspect --- -{% raw %} - # volume inspect ```markdown @@ -51,5 +49,3 @@ Example output: * [volume ls](volume_ls.md) * [volume rm](volume_rm.md) * [Understand Data Volumes](../../tutorials/dockervolumes.md) - -{% endraw %} diff --git a/engine/reference/run.md b/engine/reference/run.md index 5fc21e07b5..2be54ea8eb 100644 --- a/engine/reference/run.md +++ b/engine/reference/run.md @@ -11,8 +11,6 @@ menu: title: Docker run reference --- -{% raw %} - # Docker run reference Docker runs processes in isolated containers. A container is a process @@ -1533,5 +1531,3 @@ root directory (`/`), but the developer can set a different default with the Dockerfile `WORKDIR` command. The operator can override this with: -w="": Working directory inside the container - -{% endraw %} diff --git a/engine/swarm/admin_guide.md b/engine/swarm/admin_guide.md index 4be3a11d42..97cdcbbcf0 100644 --- a/engine/swarm/admin_guide.md +++ b/engine/swarm/admin_guide.md @@ -12,8 +12,6 @@ menu: title: Swarm administration guide --- -{% raw %} - # Administer and maintain a swarm of Docker Engines When you run a swarm of Docker Engines, **manager nodes** are the key components @@ -264,5 +262,3 @@ The `--force-new-cluster` flag puts the Docker Engine into swarm mode as a manager node of a single-node swarm. It discards swarm membership information that existed before the loss of the quorum but it retains data necessary to the Swarm such as services, tasks and the list of worker nodes. - -{% endraw %} diff --git a/engine/swarm/ingress.md b/engine/swarm/ingress.md index db2bb3af5b..02f7f464f6 100644 --- a/engine/swarm/ingress.md +++ b/engine/swarm/ingress.md @@ -15,8 +15,6 @@ menu: title: Use swarm mode routing mesh --- -{% raw %} - # Use swarm mode routing mesh Docker Engine swarm mode makes it easy to publish ports for services to make @@ -137,5 +135,3 @@ To learn more about HAProxy, see the [HAProxy documentation](https://cbonte.gith ## Learn more * [Deploy services to a swarm](services.md) - -{% endraw %} diff --git a/engine/swarm/networking.md b/engine/swarm/networking.md index af836919ef..381c50e0d8 100644 --- a/engine/swarm/networking.md +++ b/engine/swarm/networking.md @@ -13,8 +13,6 @@ menu: title: Attach services to an overlay network --- -{% raw %} - # Attach services to an overlay network Docker Engine swarm mode natively supports **overlay networks**, so you can @@ -311,5 +309,3 @@ is not the right tool to confirm VIP connectivity. * [Swarm administration guide](admin_guide.md) * [Docker Engine command line reference](../reference/commandline/index.md) * [Swarm mode tutorial](swarm-tutorial/index.md) - -{% endraw %} diff --git a/engine/tutorials/networkingcontainers.md b/engine/tutorials/networkingcontainers.md index 62f71f322b..8e5ed3b81d 100644 --- a/engine/tutorials/networkingcontainers.md +++ b/engine/tutorials/networkingcontainers.md @@ -12,8 +12,6 @@ menu: title: Network containers --- -{% raw %} - # Network containers If you are working your way through the user guide, you just built and ran a @@ -263,5 +261,3 @@ The `ping` shows it is contacting a different IP address, the address on the `my ## Next steps Now that you know how to network containers, see [how to manage data in containers](dockervolumes.md). - -{% endraw %} diff --git a/engine/tutorials/usingdocker.md b/engine/tutorials/usingdocker.md index 4c3dc60229..775810d89e 100644 --- a/engine/tutorials/usingdocker.md +++ b/engine/tutorials/usingdocker.md @@ -12,8 +12,6 @@ menu: title: Run a simple application --- -{% raw %} - # Run a simple application In the ["*Hello world in a container*"](dockerizing.md) you launched your @@ -322,5 +320,3 @@ Until now you've only used images that you've downloaded from Docker Hub. Next, you can get introduced to building and sharing our own images. Go to [Working with Docker Images](dockerimages.md). - -{% endraw %} diff --git a/engine/userguide/networking/default_network/dockerlinks.md b/engine/userguide/networking/default_network/dockerlinks.md index 999dc03d04..68306df4e3 100644 --- a/engine/userguide/networking/default_network/dockerlinks.md +++ b/engine/userguide/networking/default_network/dockerlinks.md @@ -10,8 +10,6 @@ menu: title: Legacy container links --- -{% raw %} - # Legacy container links The information in this section explains legacy container links within the Docker default bridge. This is a `bridge` network named `bridge` created automatically when you install Docker. @@ -372,5 +370,3 @@ allowing linked communication to continue. 172.17.0.9 db # Related information - -{% endraw %} diff --git a/engine/userguide/networking/work-with-networks.md b/engine/userguide/networking/work-with-networks.md index 5eca0582c6..3719ecc51c 100644 --- a/engine/userguide/networking/work-with-networks.md +++ b/engine/userguide/networking/work-with-networks.md @@ -9,8 +9,6 @@ menu: title: Work with network commands --- -{% raw %} - # Work with network commands This article provides examples of the network subcommands you can use to @@ -928,5 +926,3 @@ f7ab26d71dbd bridge bridge * [network disconnect](../../reference/commandline/network_disconnect.md) * [network ls](../../reference/commandline/network_ls.md) * [network rm](../../reference/commandline/network_rm.md) - -{% endraw %} diff --git a/machine/reference/inspect.md b/machine/reference/inspect.md index d3ee82da86..773407c957 100644 --- a/machine/reference/inspect.md +++ b/machine/reference/inspect.md @@ -9,8 +9,6 @@ menu: title: inspect --- -{% raw %} - # inspect Usage: docker-machine inspect [OPTIONS] [arg...] @@ -89,5 +87,3 @@ While this is usable, it's not very human-readable. For this reason, there is "SwarmHost": "tcp://0.0.0.0:3376", "SwarmMaster": false } - -{% endraw %} diff --git a/machine/reference/ls.md b/machine/reference/ls.md index ff2f9d681a..e13199b8e3 100644 --- a/machine/reference/ls.md +++ b/machine/reference/ls.md @@ -8,8 +8,6 @@ menu: title: ls --- -{% raw %} - # ls Usage: docker-machine ls [OPTIONS] [arg...] @@ -108,5 +106,3 @@ To list all machine names with their driver in a table format you can use: NAME DRIVER default virtualbox ec2 amazonec2 - -{% endraw %}