From 6d18b4af8d5e5386bc005de56cb6d87538a56bea Mon Sep 17 00:00:00 2001 From: Olly Pomeroy Date: Tue, 9 Jul 2019 15:46:37 +0100 Subject: [PATCH] Fixed Liquid Errors in Assemble and Interlock Signed-off-by: Olly Pomeroy --- assemble/images.md | 10 ++++++---- ee/ucp/interlock/config/custom-template.md | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/assemble/images.md b/assemble/images.md index 3b7b6d332b..44ca0d1336 100644 --- a/assemble/images.md +++ b/assemble/images.md @@ -12,8 +12,8 @@ To support multi-platform images, images must be pushed to a registry instead of To enable the multi-platform mode, use the `--push` option. For example: -``` -docker assemble build --push /path/to/my/project +```bash +$ docker assemble build --push /path/to/my/project ``` To push to an insecure (unencrypted) registry, use `--push-insecure` instead of `--push`. @@ -96,9 +96,11 @@ The runtime part includes: You can find the bill of lading by inspecting the resulting image. It is stored using the label `com.docker.assemble.bill-of-lading`: +{% raw %} +```bash +$ docker image inspect --format '{{ index .Config.Labels "com.docker.assemble.bill-of-lading" }}' ``` -docker image inspect --format '{{ index .Config.Labels "com.docker.assemble.bill-of-lading" }}' -``` +{% endraw %} > **Note:** The bill of lading is only supported on the `linux/amd64` platform and only for images which are based on Alpine (`apk`), Red Hat (`rpm`) or Debian (`dpkg-query`). diff --git a/ee/ucp/interlock/config/custom-template.md b/ee/ucp/interlock/config/custom-template.md index 8eb6ece0e5..1e46f98bc6 100644 --- a/ee/ucp/interlock/config/custom-template.md +++ b/ee/ucp/interlock/config/custom-template.md @@ -8,10 +8,10 @@ keywords: routing, proxy A custom extension template can be used if a needed option is not available in the extension configuration. -> Warning: - This should be used with extreme caution as this completely bypasses the built-in - extension template. Therefore, if you update the extension image in the future, - you will not receive the updated template because you are using a custom one. +> Warning: This should be used with extreme caution as this completely bypasses +> the built-in extension template. Therefore, if you update the extension +> image in the future, you will not receive the updated template because you are +> using a custom one. To use a custom template: @@ -24,6 +24,7 @@ First, create a Swarm config using the new template, as shown in the following e The contents of the example `custom-template.conf` include: +{% raw %} ``` # CUSTOM INTERLOCK CONFIG user {{ .ExtensionConfig.User }}; @@ -279,6 +280,7 @@ stream { } } ``` +{% endraw %} ## Creating a Swarm configuration object To create a Swarm config object: