Skip to content

Commit 681239a

Browse files
ollypomollypom
committed
Removed Reference to Interlock Preview Image, and added relevant UCP Image Org and Tag
1 parent 92b61ef commit 681239a

8 files changed

Lines changed: 25 additions & 24 deletions

File tree

‎datacenter/ucp/3.0/guides/user/interlock/deploy/configuration-reference.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ PollInterval = "3s"
2222

2323
[Extensions]
2424
[Extensions.default]
25-
Image = "docker/ucp-interlock-extension:3.0.1"
25+
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
2626
ServiceName = "ucp-interlock-extension"
2727
Args = []
2828
Constraints = ["node.labels.com.docker.ucp.orchestrator.swarm==true", "node.platform.os==linux"]
29-
ProxyImage = "docker/ucp-interlock-proxy:3.0.1"
29+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
3030
ProxyServiceName = "ucp-interlock-proxy"
3131
ProxyConfigPath = "/etc/nginx/nginx.conf"
3232
ProxyReplicas = 2

‎datacenter/ucp/3.0/guides/user/interlock/usage/service-clusters.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ PollInterval = "3s"
4949
5050
[Extensions]
5151
[Extensions.us-east]
52-
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview"
52+
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
5353
Args = ["-D"]
5454
ServiceName = "interlock-ext-us-east"
55-
ProxyImage = "nginx:alpine"
55+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
5656
ProxyArgs = []
5757
ProxyServiceName = "interlock-proxy-us-east"
5858
ProxyConfigPath = "/etc/nginx/nginx.conf"
@@ -74,10 +74,10 @@ PollInterval = "3s"
7474
proxy_region = "us-east"
7575
7676
[Extensions.us-west]
77-
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview"
77+
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
7878
Args = ["-D"]
7979
ServiceName = "interlock-ext-us-west"
80-
ProxyImage = "nginx:alpine"
80+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
8181
ProxyArgs = []
8282
ProxyServiceName = "interlock-proxy-us-west"
8383
ProxyConfigPath = "/etc/nginx/nginx.conf"
@@ -119,7 +119,7 @@ $> docker service create \
119119
--network interlock \
120120
--constraint node.role==manager \
121121
--config src=service.interlock.conf,target=/config.toml \
122-
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml
122+
{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
123123
sjpgq7h621exno6svdnsvpv9z
124124
```
125125

‎ee/ucp/interlock/config/host-mode-networking.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ PollInterval = "3s"
143143
144144
[Extensions]
145145
[Extensions.default]
146-
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview"
146+
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
147147
Args = []
148148
ServiceName = "interlock-ext"
149-
ProxyImage = "nginx:alpine"
149+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
150150
ProxyArgs = []
151151
ProxyServiceName = "interlock-proxy"
152152
ProxyConfigPath = "/etc/nginx/nginx.conf"
@@ -177,7 +177,7 @@ $> docker service create \
177177
--constraint node.role==manager \
178178
--publish mode=host,target=8080 \
179179
--config src=service.interlock.conf,target=/config.toml \
180-
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml
180+
{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
181181
sjpgq7h621exno6svdnsvpv9z
182182
```
183183

‎ee/ucp/interlock/config/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ DockerURL = "unix:///var/run/docker.sock"
173173
PollInterval = "3s"
174174

175175
[Extensions.default]
176-
Image = "docker/interlock-extension-nginx:latest"
176+
Image = "{{ page.ucp_org }}/interlock-extension-nginx:{{ page.ucp_version }}"
177177
Args = ["-D"]
178178
ServiceName = "interlock-ext"
179-
ProxyImage = "nginx:alpine"
179+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
180180
ProxyArgs = []
181181
ProxyServiceName = "interlock-proxy"
182182
ProxyConfigPath = "/etc/nginx/nginx.conf"

‎ee/ucp/interlock/config/updates.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ performs a rolling deploy to update all extensions.
8484

8585
```bash
8686
$> docker service update \
87-
--image docker/ucp-interlock:{{ page.ucp_version }} \
87+
--image { page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} \
8888
ucp-interlock
8989
```

‎ee/ucp/interlock/deploy/index.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ PollInterval = "3s"
134134
135135
[Extensions]
136136
[Extensions.default]
137-
Image = "interlockpreview/interlock-extension-nginx:2.0.0-preview"
137+
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
138138
Args = ["-D"]
139-
ProxyImage = "nginx:alpine"
139+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
140140
ProxyArgs = []
141141
ProxyConfigPath = "/etc/nginx/nginx.conf"
142142
ProxyReplicas = 1
@@ -178,7 +178,7 @@ $> docker service create \
178178
--network interlock \
179179
--constraint node.role==manager \
180180
--config src=service.interlock.conf,target=/config.toml \
181-
interlockpreview/interlock:2.0.0-preview -D run -c /config.toml
181+
{{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} -D run -c /config.toml
182182
sjpgq7h621exno6svdnsvpv9z
183183
```
184184

@@ -189,8 +189,8 @@ one for the extension service, and one for the proxy service:
189189
$> docker service ls
190190
ID NAME MODE REPLICAS IMAGE PORTS
191191
lheajcskcbby modest_raman replicated 1/1 nginx:alpine *:80->80/tcp *:443->443/tcp
192-
oxjvqc6gxf91 keen_clarke replicated 1/1 interlockpreview/interlock-extension-nginx:2.0.0-preview
193-
sjpgq7h621ex interlock replicated 1/1 interlockpreview/interlock:2.0.0-preview
192+
oxjvqc6gxf91 keen_clarke replicated 1/1 {{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}
193+
sjpgq7h621ex interlock replicated 1/1 {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }}
194194
```
195195

196196
The Interlock traffic layer is now deployed.

‎ee/ucp/interlock/deploy/offline-install.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ engine and then loading them to the Docker Swarm cluster.
1010
First, using an existing Docker engine, save the images:
1111

1212
```bash
13-
$> docker save docker/interlock:latest > interlock.tar
14-
$> docker save docker/interlock-extension-nginx:latest > interlock-extension-nginx.tar
15-
$> docker save nginx:alpine > nginx.tar
13+
$> docker save {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} > interlock.tar
14+
$> docker save {{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }} > interlock-extension-nginx.tar
15+
$> docker save {{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }} > nginx.tar
1616
```
1717

18-
Note: replace `docker/interlock-extension-nginx:latest` and `nginx:alpine` with the corresponding
19-
extension and proxy image if you are not using Nginx.
18+
Note: replace `{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version
19+
}}` and `{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}` with the
20+
corresponding extension and proxy image if you are not using Nginx.
2021

2122
You should have the following two files:
2223

‎ee/ucp/interlock/usage/service-clusters.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ PollInterval = "3s"
161161
Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
162162
Args = []
163163
ServiceName = "ucp-interlock-extension-us-west"
164-
ProxyImage = "docker/ucp-interlock-proxy:3.1.2"
164+
ProxyImage = "{{ page.ucp_org }}/ucp-interlock-proxy:{{ page.ucp_version }}"
165165
ProxyArgs = []
166166
ProxyServiceName = "ucp-interlock-proxy-us-west"
167167
ProxyConfigPath = "/etc/nginx/nginx.conf"

0 commit comments

Comments
 (0)