From 8198b1977a02e582d33e59f5d3c7f56dbfae04c4 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Wed, 21 Nov 2018 09:32:01 -0500
Subject: [PATCH] Using registry images with new container names

---
 cron_docker/env.properties  |  4 ++--
 docker-compose.yml          | 24 ++++++++++++------------
 proxy_docker/env.properties |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cron_docker/env.properties b/cron_docker/env.properties
index e49eee3..a441ac3 100644
--- a/cron_docker/env.properties
+++ b/cron_docker/env.properties
@@ -1,2 +1,2 @@
-TX_CONF_URL=cyphernode:8888/executecallbacks
-OTS_URL=cyphernode:8888/ots_backoffice
+TX_CONF_URL=proxy:8888/executecallbacks
+OTS_URL=proxy:8888/ots_backoffice
diff --git a/docker-compose.yml b/docker-compose.yml
index b46cbdc..e898d1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,11 @@
 version: "3"
 
 services:
-  authapi:
+  gatekeeper:
     # HTTP authentication API gate
     env_file:
       - api_auth_docker/env.properties
-    image: authapi
+    image: cyphernode/gatekeeper:cyphernode-0.05
     ports:
 #      - "80:80"
       - "443:443"
@@ -18,11 +18,11 @@ services:
     networks:
       - cyphernodenet
 
-  cyphernode:
+  proxy:
     # Bitcoin Mini Proxy
     env_file:
       - proxy_docker/env.properties
-    image: btcproxyimg
+    image: cyphernode/proxy:cyphernode-0.05
     volumes:
       # Variable substitutions don't work
       # Match with DB_PATH in proxy_docker/env.properties
@@ -38,18 +38,18 @@ services:
     networks:
       - cyphernodenet
 
-  proxycronnode:
+  proxycron:
     # Async jobs
     env_file:
       - cron_docker/env.properties
-    image: proxycronimg
+    image: cyphernode/proxycron:cyphernode-0.05
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
     networks:
       - cyphernodenet
 
-  pycoinnode:
+  pycoin:
     # Pycoin
     env_file:
       - pycoin_docker/env.properties
@@ -65,7 +65,7 @@ services:
     # otsclient JS
     env_file:
       - otsclient_docker/env.properties
-    image: otsclientimg
+    image: cyphernode/ots:cyphernode-0.05
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
@@ -75,9 +75,9 @@ services:
     networks:
       - cyphernodenet
 
-  clightningnode:
+  lightning:
     # c-lightning lightning network node
-    image: clnimg
+    image: cyphernode/clightning:dev
     ports:
       - "9735:9735"
     volumes:
@@ -89,9 +89,9 @@ services:
     networks:
       - cyphernodenet
 
-  btcnode:
+  bitcoin:
     # Bitcoin node
-    image: btcnode
+    image: cyphernode/bitcoin:0.17.0
 #    ports:
 #      - "18333:18333"
 #      - "29000:29000"
diff --git a/proxy_docker/env.properties b/proxy_docker/env.properties
index 6de427e..4801108 100644
--- a/proxy_docker/env.properties
+++ b/proxy_docker/env.properties
@@ -1,8 +1,8 @@
 TRACING=1
-WATCHER_BTC_NODE_RPC_URL=btcnode:18332/wallet/watching01.dat
+WATCHER_BTC_NODE_RPC_URL=bitcoin:18332/wallet/watching01.dat
 WATCHER_BTC_NODE_RPC_USER=rpc_username:rpc_password
 WATCHER_BTC_NODE_RPC_CFG=/proxy/watcher_btcnode_curlcfg.properties
-SPENDER_BTC_NODE_RPC_URL=btcnode:18332/wallet/spending01.dat
+SPENDER_BTC_NODE_RPC_URL=bitcoin:18332/wallet/spending01.dat
 SPENDER_BTC_NODE_RPC_USER=rpc_username:rpc_password
 SPENDER_BTC_NODE_RPC_CFG=/proxy/spender_btcnode_curlcfg.properties
 PROXY_LISTENING_PORT=8888
@@ -10,7 +10,7 @@ PROXY_LISTENING_PORT=8888
 DB_PATH=/proxy/db
 DB_FILE=/proxy/db/proxydb
 # Pycoin container
-PYCOIN_CONTAINER=pycoinnode:7777
+PYCOIN_CONTAINER=pycoin:7777
 # OTS container
 OTSCLIENT_CONTAINER=otsclient:6666
 OTS_FILES=/otsfiles