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

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

@@ -22,11 +22,11 @@ PollInterval = "3s"
 
 [Extensions]
   [Extensions.default]
-    Image = "docker/ucp-interlock-extension:3.0.1"
+    Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
     ServiceName = "ucp-interlock-extension"
     Args = []
     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"
     ProxyConfigPath = "/etc/nginx/nginx.conf"
     ProxyReplicas = 2

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

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

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

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

ee/ucp/interlock/config/index.md

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

ee/ucp/interlock/config/updates.md

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

ee/ucp/interlock/deploy/index.md

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

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

@@ -10,13 +10,14 @@ engine and then loading them to the Docker Swarm cluster.
 First, using an existing Docker engine, save the images:
 
 ```bash
-$> docker save docker/interlock:latest > interlock.tar
-$> docker save docker/interlock-extension-nginx:latest > interlock-extension-nginx.tar
-$> docker save nginx:alpine > nginx.tar
+$> docker save {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} > interlock.tar
+$> docker save {{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }} > interlock-extension-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
-extension and proxy image if you are not using Nginx.
+Note: replace `{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version
+}}` 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:
 

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

@@ -161,7 +161,7 @@ PollInterval = "3s"
     Image = "{{ page.ucp_org }}/ucp-interlock-extension:{{ page.ucp_version }}"
     Args = []
     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 = []
     ProxyServiceName = "ucp-interlock-proxy-us-west"
     ProxyConfigPath = "/etc/nginx/nginx.conf"