diff options
| author |   Tomáš Levora <t.levora@partner.samsung.com> | 2019-03-28 17:45:55 +0100 |
|---|---|---|
| committer | Tomáš Levora <t.levora@partner.samsung.com> | 2019-04-05 11:41:16 +0000 |
| commit | a0ad5c1091c43b96b7b54b4a2c4eca02d5f9a4eb (patch) | |
| tree | f953a79e5314787e66c6e4788822aa230dc04177 /build | |
| parent | 171c3dc7dd5a9cdc25651812dc716174c38d5f06 (diff) | |
Adding versions for infra related docker images
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>
Diffstat (limited to 'build')
4 files changed, 8 insertions, 3 deletions
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 diff --git a/build/data_lists/infra_docker_images.list b/build/data_lists/infra_docker_images.list index af156cfc..83374b8f 100644 --- a/build/data_lists/infra_docker_images.list +++ b/build/data_lists/infra_docker_images.list @@ -1,3 +1,3 @@ andyshinn/dnsmasq:2.76 -consol/centos-icewm-vnc:latest +consol/centos-icewm-vnc:1.4.0 sonatype/nexus3:3.15.2 |