docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1256 from ollypom/fixinterlockliquid 

Fixed Liquid Errors in Assemble and Interlock
This commit is contained in:
Usha Mandya 2019-07-09 16:18:59 +01:00 committed by GitHub
parent f27ff20502 6d18b4af8d
commit efb42e4d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assemble/images.md
View File

@ -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: To enable the multi-platform mode, use the `--push` option. For example:
``` ```bash
docker assemble build --push /path/to/my/project $ docker assemble build --push /path/to/my/project
``` ```
To push to an insecure (unencrypted) registry, use `--push-insecure` instead of `--push`. 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`: 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" }}' <image>
``` ```
docker image inspect --format '{{ index .Config.Labels "com.docker.assemble.bill-of-lading" }}' <image> {% 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`). > **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`).

10
ee/ucp/interlock/config/custom-template.md
View File

@ -8,10 +8,10 @@ keywords: routing, proxy
A custom extension template can be A custom extension template can be
used if a needed option is not available in the extension configuration. used if a needed option is not available in the extension configuration.
> Warning: > Warning: This should be used with extreme caution as this completely bypasses
This should be used with extreme caution as this completely bypasses the built-in > the built-in extension template. Therefore, if you update the extension
extension template. Therefore, if you update the extension image in the future, > image in the future, you will not receive the updated template because you are
you will not receive the updated template because you are using a custom one. > using a custom one.
To use a custom template: 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: The contents of the example `custom-template.conf` include:
{% raw %}
``` ```
# CUSTOM INTERLOCK CONFIG # CUSTOM INTERLOCK CONFIG
user {{ .ExtensionConfig.User }}; user {{ .ExtensionConfig.User }};
@ -279,6 +280,7 @@ stream {
} }
} }
``` ```
{% endraw %}
## Creating a Swarm configuration object ## Creating a Swarm configuration object
To create a Swarm config object: To create a Swarm config object: