From 055c74aa5266ebcfe4b1f6011a9ba55eac3b0988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 10 Nov 2020 15:39:24 +0100
Subject: [PATCH] beacon-node-builds: set entrypoint based on targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ansible/roles/beacon-node-builds/defaults/main.yml        | 8 ++++----
 ansible/roles/beacon-node-builds/tasks/build.yml          | 4 ++--
 .../{files/Dockerfile => templates/Dockerfile.j2}         | 6 ++++--
 ansible/roles/beacon-node-builds/templates/build.sh.j2    | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename ansible/roles/beacon-node-builds/{files/Dockerfile => templates/Dockerfile.j2} (60%)

diff --git a/ansible/roles/beacon-node-builds/defaults/main.yml b/ansible/roles/beacon-node-builds/defaults/main.yml
index a0cfc76..f17fc2e 100644
--- a/ansible/roles/beacon-node-builds/defaults/main.yml
+++ b/ansible/roles/beacon-node-builds/defaults/main.yml
@@ -13,17 +13,17 @@ beacon_node_build_timer_timeout: 1200
 beacon_node_builds_branches:
   - name: 'devel'
     branch: 'devel'
-    target: 'nimbus_beacon_node_spec_0_12_3 nimbus_signing_process'
+    targets: ['nimbus_beacon_node_spec_0_12_3', 'nimbus_signing_process']
     frequency: '*-*-* 10:00:00'
   - name: 'master'
     branch: 'master'
-    target: 'nimbus_beacon_node_spec_0_12_3 nimbus_signing_process'
+    targets: ['nimbus_beacon_node_spec_0_12_3', 'nimbus_signing_process']
     frequency: '*-*-* 02:00:00'
   - name: 'libp2p'
     branch: 'nim-libp2p-auto-bump'
-    target: 'nimbus_beacon_node_spec_0_12_3 nimbus_signing_process'
+    targets: ['nimbus_beacon_node_spec_0_12_3', 'nimbus_signing_process']
     frequency: '*-*-* 18:00:00'
   - name: 'toledo'
     branch: 'devel'
-    target: 'nimbus_beacon_node nimbus_signing_process'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
     frequency: '*-*-* 20:00:00'
diff --git a/ansible/roles/beacon-node-builds/tasks/build.yml b/ansible/roles/beacon-node-builds/tasks/build.yml
index 7a2dc47..0ee3794 100644
--- a/ansible/roles/beacon-node-builds/tasks/build.yml
+++ b/ansible/roles/beacon-node-builds/tasks/build.yml
@@ -25,8 +25,8 @@
     mode: 0755
 
 - name: '{{ item.name }} - Create Dockerfile'
-  copy:
-    src: 'Dockerfile'
+  template:
+    src: 'Dockerfile.j2'
     dest: '{{ beacon_node_builds_path }}/{{ item.name }}/Dockerfile'
     owner: '{{ beacon_node_builds_user }}'
     group: 'adm'
diff --git a/ansible/roles/beacon-node-builds/files/Dockerfile b/ansible/roles/beacon-node-builds/templates/Dockerfile.j2
similarity index 60%
rename from ansible/roles/beacon-node-builds/files/Dockerfile
rename to ansible/roles/beacon-node-builds/templates/Dockerfile.j2
index d228a75..e7cb218 100644
--- a/ansible/roles/beacon-node-builds/files/Dockerfile
+++ b/ansible/roles/beacon-node-builds/templates/Dockerfile.j2
@@ -7,10 +7,12 @@ RUN apt-get -qq update \
  && apt-get -qq clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY repo/build/beacon_node repo/build/signing_process /usr/local/bin/
+{% for target in item.targets %}
+COPY repo/build/{{ target }} /usr/local/bin/
+{% endfor %}
 
 STOPSIGNAL SIGINT
 
-ENTRYPOINT ["/usr/local/bin/beacon_node"]
+ENTRYPOINT ["/usr/local/bin/{{ item.targets | first }}"]
 
 CMD ["--help"]
diff --git a/ansible/roles/beacon-node-builds/templates/build.sh.j2 b/ansible/roles/beacon-node-builds/templates/build.sh.j2
index 2653827..a02cd59 100644
--- a/ansible/roles/beacon-node-builds/templates/build.sh.j2
+++ b/ansible/roles/beacon-node-builds/templates/build.sh.j2
@@ -30,7 +30,7 @@ make \
     LOG_LEVEL="TRACE" \
     MAKEFLAGS="-j$(nproc)" \
     NIMFLAGS="-d:insecure -d:testnet_servers_image" \
-    {{ item.target }}
+    {{ item.targets | join(" ") }}
 
 popd