tests: Simplify Dockerfile(s)

This commit is contained in:
Radek Simko 2019-03-05 08:20:44 +00:00
parent cc12b16c44
commit 82a52bc0d8
No known key found for this signature in database
GPG key ID: 1F1C84FE689A88D7
6 changed files with 14 additions and 20 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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