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

Removed Reference to Interlock Preview Image, and added relevant UCP Image Org and Tag

This commit is contained in:
ollypom 2019-04-21 18:35:15 +01:00
parent 92b61efbd3
commit 681239ae3f
8 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datacenter/ucp/3.0/guides/user/interlock/deploy/configuration-reference.md
View File

@ -22,11 +22,11 @@ PollInterval = "3s"
[Extensions] [Extensions]
[Extensions.default] [Extensions.default]
Image = "docker/ucp-interlock-extension:3.0.1" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
ServiceName = "ucp-interlock-extension" ServiceName = "ucp-interlock-extension"
Args = [] Args = []
Constraints = ["node.labels.com.docker.ucp.orchestrator.swarm==true", "node.platform.os==linux"] Constraints = ["node.labels.com.docker.ucp.orchestrator.swarm==true", "node.platform.os==linux"]
ProxyImage = "docker/ucp-interlock-proxy:3.0.1" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyServiceName = "ucp-interlock-proxy" ProxyServiceName = "ucp-interlock-proxy"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"
ProxyReplicas = 2 ProxyReplicas = 2

10
datacenter/ucp/3.0/guides/user/interlock/usage/service-clusters.md
View File

@ -49,10 +49,10 @@ PollInterval = "3s"
[Extensions] [Extensions]
[Extensions.us-east] [Extensions.us-east]
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
Args = ["-D"] Args = ["-D"]
ServiceName = "interlock-ext-us-east" ServiceName = "interlock-ext-us-east"
ProxyImage = "nginx:alpine" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyServiceName = "interlock-proxy-us-east" ProxyServiceName = "interlock-proxy-us-east"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"
@ -74,10 +74,10 @@ PollInterval = "3s"
proxy_region = "us-east" proxy_region = "us-east"
[Extensions.us-west] [Extensions.us-west]
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
Args = ["-D"] Args = ["-D"]
ServiceName = "interlock-ext-us-west" ServiceName = "interlock-ext-us-west"
ProxyImage = "nginx:alpine" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyServiceName = "interlock-proxy-us-west" ProxyServiceName = "interlock-proxy-us-west"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"
@ -119,7 +119,7 @@ $> docker service create \
--network interlock \ --network interlock \
--constraint node.role==manager \ --constraint node.role==manager \
--config src=service.interlock.conf,target=/config.toml \ --config src=service.interlock.conf,target=/config.toml \
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml { page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
sjpgq7h621exno6svdnsvpv9z sjpgq7h621exno6svdnsvpv9z
``` ```

6
ee/ucp/interlock/config/host-mode-networking.md
View File

@ -143,10 +143,10 @@ PollInterval = "3s"
[Extensions] [Extensions]
[Extensions.default] [Extensions.default]
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
Args = [] Args = []
ServiceName = "interlock-ext" ServiceName = "interlock-ext"
ProxyImage = "nginx:alpine" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyServiceName = "interlock-proxy" ProxyServiceName = "interlock-proxy"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"
@ -177,7 +177,7 @@ $> docker service create \
--constraint node.role==manager \ --constraint node.role==manager \
--publish mode=host,target=8080 \ --publish mode=host,target=8080 \
--config src=service.interlock.conf,target=/config.toml \ --config src=service.interlock.conf,target=/config.toml \
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml { page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
sjpgq7h621exno6svdnsvpv9z sjpgq7h621exno6svdnsvpv9z
``` ```

4
ee/ucp/interlock/config/index.md
View File

@ -173,10 +173,10 @@ DockerURL = "unix:///var/run/docker.sock"
PollInterval = "3s" PollInterval = "3s"
[Extensions.default] [Extensions.default]
Image = "docker/interlock-extension-nginx:latest" Image = "{{ page.ucp_org }}/interlock-extension-nginx:{{ page.ucp_version }}"
Args = ["-D"] Args = ["-D"]
ServiceName = "interlock-ext" ServiceName = "interlock-ext"
ProxyImage = "nginx:alpine" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyServiceName = "interlock-proxy" ProxyServiceName = "interlock-proxy"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"

2
ee/ucp/interlock/config/updates.md
View File

@ -84,6 +84,6 @@ performs a rolling deploy to update all extensions.
```bash ```bash
$> docker service update \ $> docker service update \
--image docker/ucp-interlock:{{ page.ucp_version }} \ --image { page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} \
ucp-interlock ucp-interlock
``` ```

10
ee/ucp/interlock/deploy/index.md
View File

@ -134,9 +134,9 @@ PollInterval = "3s"
[Extensions] [Extensions]
[Extensions.default] [Extensions.default]
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
Args = ["-D"] Args = ["-D"]
ProxyImage = "nginx:alpine" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"
ProxyReplicas = 1 ProxyReplicas = 1
@ -178,7 +178,7 @@ $> docker service create \
--network interlock \ --network interlock \
--constraint node.role==manager \ --constraint node.role==manager \
--config src=service.interlock.conf,target=/config.toml \ --config src=service.interlock.conf,target=/config.toml \
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
sjpgq7h621exno6svdnsvpv9z sjpgq7h621exno6svdnsvpv9z
``` ```
@ -189,8 +189,8 @@ one for the extension service, and one for the proxy service:
$> docker service ls $> docker service ls
ID NAME MODE REPLICAS IMAGE PORTS ID NAME MODE REPLICAS IMAGE PORTS
lheajcskcbby modest_raman replicated 1/1 nginx:alpine *:80->80/tcp *:443->443/tcp lheajcskcbby modest_raman replicated 1/1 nginx:alpine *:80->80/tcp *:443->443/tcp
oxjvqc6gxf91 keen_clarke replicated 1/1 interlockpreview/interlock-extension-nginx:2.0.0-preview oxjvqc6gxf91 keen_clarke replicated 1/1 {{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}
sjpgq7h621ex interlock replicated 1/1 interlockpreview/interlock:2.0.0-preview sjpgq7h621ex interlock replicated 1/1 {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }}
``` ```
The Interlock traffic layer is now deployed. The Interlock traffic layer is now deployed.

11
ee/ucp/interlock/deploy/offline-install.md
View File

@ -10,13 +10,14 @@ engine and then loading them to the Docker Swarm cluster.
First, using an existing Docker engine, save the images: First, using an existing Docker engine, save the images:
```bash ```bash
$> docker save docker/interlock:latest > interlock.tar $> docker save {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} > interlock.tar
$> docker save docker/interlock-extension-nginx:latest > interlock-extension-nginx.tar $> docker save {{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }} > interlock-extension-nginx.tar
$> docker save nginx:alpine > nginx.tar $> docker save {{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }} > nginx.tar
``` ```
Note: replace `docker/interlock-extension-nginx:latest` and `nginx:alpine` with the corresponding Note: replace `{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version
extension and proxy image if you are not using Nginx. }}` and `{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}` with the
corresponding extension and proxy image if you are not using Nginx.
You should have the following two files: You should have the following two files:

2
ee/ucp/interlock/usage/service-clusters.md
View File

@ -161,7 +161,7 @@ PollInterval = "3s"
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}" Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
Args = [] Args = []
ServiceName = "ucp-interlock-extension-us-west" ServiceName = "ucp-interlock-extension-us-west"
ProxyImage = "docker/ucp-interlock-proxy:3.1.2" ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
ProxyArgs = [] ProxyArgs = []
ProxyServiceName = "ucp-interlock-proxy-us-west" ProxyServiceName = "ucp-interlock-proxy-us-west"
ProxyConfigPath = "/etc/nginx/nginx.conf" ProxyConfigPath = "/etc/nginx/nginx.conf"