From 82a52bc0d8295d6b359572cb704f236999699683 Mon Sep 17 00:00:00 2001
From: Radek Simko <radek.simko@gmail.com>
Date: Tue, 5 Mar 2019 08:20:44 +0000
Subject: [PATCH] tests: Simplify Dockerfile(s)

---
 scripts/testing/Dockerfile                 | 11 +++++++++++
 scripts/testing/Dockerfile_v1              |  6 ------
 scripts/testing/Dockerfile_v2              |  6 ------
 scripts/testing/Dockerfile_v3              |  6 ------
 scripts/testing/setup_private_registry.bat |  3 ++-
 scripts/testing/setup_private_registry.sh  |  2 +-
 6 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 scripts/testing/Dockerfile
 delete mode 100644 scripts/testing/Dockerfile_v1
 delete mode 100644 scripts/testing/Dockerfile_v2
 delete mode 100644 scripts/testing/Dockerfile_v3

diff --git a/scripts/testing/Dockerfile b/scripts/testing/Dockerfile
new file mode 100644
index 00000000..2e9cd969
--- /dev/null
+++ b/scripts/testing/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:6.12.3-slim
+
+ARG JS_FILE_PATH
+
+COPY configs.json .
+COPY secrets.json .
+COPY $JS_FILE_PATH server.js
+
+CMD [ "node", "server.js" ]
+
+EXPOSE 8080
diff --git a/scripts/testing/Dockerfile_v1 b/scripts/testing/Dockerfile_v1
deleted file mode 100644
index dafa10e9..00000000
--- a/scripts/testing/Dockerfile_v1
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM node:6.12.3-slim
-EXPOSE 8080
-COPY configs.json .
-COPY secrets.json .
-COPY server_v1.js .
-CMD node server_v1.js
diff --git a/scripts/testing/Dockerfile_v2 b/scripts/testing/Dockerfile_v2
deleted file mode 100644
index dbee88c4..00000000
--- a/scripts/testing/Dockerfile_v2
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM node:6.12.3-slim
-EXPOSE 8080
-COPY configs.json .
-COPY secrets.json .
-COPY server_v2.js .
-CMD node server_v2.js
diff --git a/scripts/testing/Dockerfile_v3 b/scripts/testing/Dockerfile_v3
deleted file mode 100644
index ff2b76bf..00000000
--- a/scripts/testing/Dockerfile_v3
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM node:6.12.3-slim
-EXPOSE 8080
-COPY configs.json .
-COPY secrets.json .
-COPY server_v3.js .
-CMD node server_v3.js
diff --git a/scripts/testing/setup_private_registry.bat b/scripts/testing/setup_private_registry.bat
index 653ff030..0b2a7a8b 100644
--- a/scripts/testing/setup_private_registry.bat
+++ b/scripts/testing/setup_private_registry.bat
@@ -63,8 +63,9 @@ if %ErrorLevel% neq 0 (
 for /L %%i in (1,1,3) do (
   call docker build ^
     -t tftest-service ^
+    --build-arg JS_FILE_PATH=server_v%%i.js ^
     %~dp0 ^
-    -f %~dp0Dockerfile_v%%i
+    -f %~dp0Dockerfile
   call docker tag ^
     tftest-service ^
     127.0.0.1:15000/tftest-service:v%%i
diff --git a/scripts/testing/setup_private_registry.sh b/scripts/testing/setup_private_registry.sh
index f7d0505e..c7236b4b 100755
--- a/scripts/testing/setup_private_registry.sh
+++ b/scripts/testing/setup_private_registry.sh
@@ -31,7 +31,7 @@ sleep 5
 docker login -u testuser -p testpwd 127.0.0.1:15000
 # Build private images
 for i in $(seq 1 3); do 
-  docker build -t tftest-service "$(pwd)"/scripts/testing -f "$(pwd)"/scripts/testing/Dockerfile_v${i}
+  docker build -t tftest-service --build-arg JS_FILE_PATH=server_v${i}.js "$(pwd)"/scripts/testing -f "$(pwd)"/scripts/testing/Dockerfile
   docker tag tftest-service 127.0.0.1:15000/tftest-service:v${i}
   docker push 127.0.0.1:15000/tftest-service:v${i}
 done