Rename squeaknode docker container (#377)

docker/docker-compose.yml

@@ -34,12 +34,12 @@ services:
       - net.ipv6.conf.all.disable_ipv6=0
     entrypoint: ["./start-lnd.sh"]
 
-  sqkserver:
-    image: sqkserver
-    container_name: sqkserver
+  squeaknode:
+    image: squeaknode
+    container_name: squeaknode
     build:
       context: ../
-      dockerfile: docker/sqkserver/Dockerfile
+      dockerfile: docker/squeaknode/Dockerfile
     environment:
       - WEBADMIN_USE_SSL
       - WEBADMIN_LOGIN_DISABLED
@@ -58,7 +58,7 @@ services:
       - "lnd:lnd"
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
-    entrypoint: ["./start-sqkserver.sh"]
+    entrypoint: ["./start-squeaknode.sh"]
 
 volumes:
   # shared volume is needed for sharing the btcd certificate

docker/squeaknode/Dockerfile

@@ -35,5 +35,5 @@ EXPOSE 18994
 EXPOSE 12994
 
 # Copy the entrypoint script.
-COPY "docker/sqkserver/start-sqkserver.sh" .
-RUN chmod +x start-sqkserver.sh
+COPY "docker/squeaknode/start-squeaknode.sh" .
+RUN chmod +x start-squeaknode.sh

itests/docker-compose.yml

@@ -70,12 +70,12 @@ services:
       - net.ipv6.conf.all.disable_ipv6=0
     entrypoint: ["./start-lnd.sh"]
 
-  sqkserver:
-    image: sqkserver
-    container_name: test_sqkserver
+  squeaknode:
+    image: squeaknode
+    container_name: test_squeaknode
     build:
       context: ../
-      dockerfile: docker/sqkserver/Dockerfile
+      dockerfile: docker/squeaknode/Dockerfile
     volumes:
       - test_shared:/rpc
       - test_lnd_server_dir:/root/.lnd
@@ -85,14 +85,14 @@ services:
       - "lnd_server:lnd"
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
-    entrypoint: ["./start-sqkserver.sh"]
+    entrypoint: ["./start-squeaknode.sh"]
 
-  sqkserver_other:
-    image: sqkserver
-    container_name: test_sqkserver_other
+  squeaknode_other:
+    image: squeaknode
+    container_name: test_squeaknode_other
     build:
       context: ../
-      dockerfile: docker/sqkserver/Dockerfile
+      dockerfile: docker/squeaknode/Dockerfile
     volumes:
       - test_shared:/rpc
       - test_lnd_client_dir:/root/.lnd
@@ -102,7 +102,7 @@ services:
       - "lnd_client:lnd"
     sysctls:
       - net.ipv6.conf.all.disable_ipv6=0
-    entrypoint: ["./start-sqkserver.sh"]
+    entrypoint: ["./start-squeaknode.sh"]
 
   test:
     image: test

itests/tests/conftest.py

@@ -14,25 +14,25 @@ def select_mainnet_params():
 
 @pytest.fixture
 def server_stub():
-    with grpc.insecure_channel("sqkserver:8774") as server_channel:
+    with grpc.insecure_channel("squeaknode:8774") as server_channel:
         yield squeak_server_pb2_grpc.SqueakServerStub(server_channel)
 
 
 @pytest.fixture
 def other_server_stub():
-    with grpc.insecure_channel("sqkserver_other:8774") as server_channel:
+    with grpc.insecure_channel("squeaknode_other:8774") as server_channel:
         yield squeak_server_pb2_grpc.SqueakServerStub(server_channel)
 
 
 @pytest.fixture
 def admin_stub():
-    with grpc.insecure_channel("sqkserver:8994") as admin_channel:
+    with grpc.insecure_channel("squeaknode:8994") as admin_channel:
         yield squeak_admin_pb2_grpc.SqueakAdminStub(admin_channel)
 
 
 @pytest.fixture
 def other_admin_stub():
-    with grpc.insecure_channel("sqkserver_other:8994") as admin_channel:
+    with grpc.insecure_channel("squeaknode_other:8994") as admin_channel:
         yield squeak_admin_pb2_grpc.SqueakAdminStub(admin_channel)
 
 

itests/tests/test_squeak_node.py

@@ -790,7 +790,7 @@ def test_connect_other_node(server_stub, admin_stub, other_server_stub, other_ad
     # Add the main node as a peer
     create_peer_response = other_admin_stub.CreatePeer(
         squeak_admin_pb2.CreatePeerRequest(
-            host="sqkserver",
+            host="squeaknode",
             port=8774,
         )
     )
@@ -907,7 +907,7 @@ def test_download_single_squeak(server_stub, admin_stub, other_server_stub, othe
     # Add the main node as a peer
     create_peer_response = other_admin_stub.CreatePeer(
         squeak_admin_pb2.CreatePeerRequest(
-            host="sqkserver",
+            host="squeaknode",
             port=8774,
         )
     )