From a0ad5c1091c43b96b7b54b4a2c4eca02d5f9a4eb Mon Sep 17 00:00:00 2001
From: Tomáš Levora <t.levora@partner.samsung.com>
Date: Thu, 28 Mar 2019 17:45:55 +0100
Subject: Adding versions for infra related docker images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. latest tag replaced by version number for vnc server
2. added specific version for own_nginx image
3. version control improved in ansible roles accordingly

Solves OOM-1766

Issue-ID: OOM-1767

Change-Id: I147c56b46a419188099d8ed3e78fed68810893e2
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
---
 build/creating_data/create_nginx_image/01create-image.sh | 6 ++++--
 build/creating_data/create_nginx_image/Dockerfile        | 2 ++
 build/creating_data/create_nginx_image/VERSION           | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 build/creating_data/create_nginx_image/VERSION

(limited to 'build/creating_data/create_nginx_image')

diff --git a/build/creating_data/create_nginx_image/01create-image.sh b/build/creating_data/create_nginx_image/01create-image.sh
index aa62e40a..4ca382a7 100755
--- a/build/creating_data/create_nginx_image/01create-image.sh
+++ b/build/creating_data/create_nginx_image/01create-image.sh
@@ -18,6 +18,8 @@
 #
 #   COPYRIGHT NOTICE ENDS HERE
 
+VERSION="$(cat $(dirname ${0})/VERSION)"
+
 IMG_DIR="${1}"
 
 if [[ ! -e $IMG_DIR ]]; then
@@ -26,5 +28,5 @@ fi
 
 script_dir="$(dirname ${BASH_SOURCE[0]})"
 cd "$script_dir"
-docker build -t own_nginx .
-docker -l error save -o "$IMG_DIR/own_nginx_latest.tar" "own_nginx:latest"
+docker build -t own_nginx:${VERSION} .
+docker -l error save -o "$IMG_DIR/own_nginx_${VERSION}.tar" "own_nginx:${VERSION}"
diff --git a/build/creating_data/create_nginx_image/Dockerfile b/build/creating_data/create_nginx_image/Dockerfile
index 6a14f221..27249ae9 100644
--- a/build/creating_data/create_nginx_image/Dockerfile
+++ b/build/creating_data/create_nginx_image/Dockerfile
@@ -20,6 +20,8 @@ FROM nginx:alpine
 
 RUN apk add --no-cache --update fcgiwrap git git-daemon spawn-fcgi
 
+ADD VERSION .
+
 COPY gitconfig /etc/
 
 CMD spawn-fcgi -M 666 -s /var/run/fcgiwrap.socket /usr/bin/fcgiwrap && \
diff --git a/build/creating_data/create_nginx_image/VERSION b/build/creating_data/create_nginx_image/VERSION
new file mode 100644
index 00000000..227cea21
--- /dev/null
+++ b/build/creating_data/create_nginx_image/VERSION
@@ -0,0 +1 @@
+2.0.0
-- 
cgit 1.2.3-korg