diff options
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 |