From 62176b5b6cd0ee614061fddb949658114931c5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Thu, 25 Jun 2020 22:34:44 +0200
Subject: [PATCH 1/2] don't try to start containers

and remove some unused commands/variables.

The rationale is that these containers need validator keys uploaded to
them before they can start and this is managed elsewhere.
---
 defaults/main.yml   |  2 --
 tasks/container.yml | 15 ++-------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d18033d..f196539 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -33,5 +33,3 @@ beacon_node_restart_window_sec: 120
 
 # general container management
 compose_recreate: false
-compose_restart: false
-compose_destroy: false
diff --git a/tasks/container.yml b/tasks/container.yml
index 6f2bf6e..ca6dda9 100644
--- a/tasks/container.yml
+++ b/tasks/container.yml
@@ -19,19 +19,8 @@
       {% if compose_recreate %}
       --force-recreate \
       {% endif %}
-      --no-color
+      --no-color \
+      --no-start
   args:
     chdir: '{{ beacon_node_cont_vol }}'
-  when: compose_state == "present"
 
-- name: 'Restart container: {{ beacon_node_cont_name }}'
-  command: docker-compose --compatibility down
-  args:
-    chdir: '{{ beacon_node_cont_vol }}'
-  when: compose_restart
-
-- name: 'Destroy container: {{ beacon_node_cont_name }}'
-  command: docker-compose --compatibility down
-  args:
-    chdir: '{{ beacon_node_cont_vol }}'
-  when: compose_destroy

From d363a54a1fe52443ac50d059cdb40e9d0054fe6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Fri, 26 Jun 2020 17:50:31 +0200
Subject: [PATCH 2/2] testnet2-specific args

---
 tasks/compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/compose.yml b/tasks/compose.yml
index f256e2a..2f5c16f 100644
--- a/tasks/compose.yml
+++ b/tasks/compose.yml
@@ -34,6 +34,10 @@
             - '{{ beacon_node_listening_port }}:{{ beacon_node_listening_port }}/tcp'
             - '{{ beacon_node_discovery_port }}:{{ beacon_node_discovery_port }}/udp'
           command:
+            {% if beacon_node_network == "testnet2" %}
+            - '--run'
+            - '--'
+            {% endif %}
             - '--nat=extip:{{ beacon_node_public_address }}'
             - '--log-level={{ beacon_node_log_level }}'
             - '--tcp-port={{ beacon_node_listening_port }}'