From c32237360ddf9428247128bc722e15f2853d53b6 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Jun 2018 20:47:07 -0700 Subject: [PATCH] Updated build script --- agent/alpine/build.sh | 30 +--------------- agent/centos/build.sh | 30 +--------------- agent/ubuntu/build.sh | 25 +------------ build.sh | 61 ++++++++++++++++++++++++++++++++ java-gateway/alpine/build.sh | 25 +------------ java-gateway/centos/build.sh | 25 +------------ java-gateway/ubuntu/build.sh | 25 +------------ proxy-mysql/alpine/build.sh | 29 +-------------- proxy-mysql/centos/build.sh | 29 +-------------- proxy-mysql/ubuntu/build.sh | 29 +-------------- proxy-sqlite3/alpine/build.sh | 26 +------------- proxy-sqlite3/centos/build.sh | 29 +-------------- proxy-sqlite3/ubuntu/build.sh | 26 +------------- server-mysql/alpine/build.sh | 29 +-------------- server-mysql/centos/build.sh | 29 +-------------- server-mysql/ubuntu/build.sh | 29 +-------------- server-pgsql/alpine/build.sh | 26 +------------- server-pgsql/centos/build.sh | 26 +------------- server-pgsql/ubuntu/build.sh | 26 +------------- snmptraps/alpine/build.sh | 25 +------------ snmptraps/centos/build.sh | 25 +------------ snmptraps/ubuntu/build.sh | 25 +------------ web-apache-mysql/alpine/build.sh | 29 +-------------- web-apache-mysql/centos/build.sh | 29 +-------------- web-apache-mysql/ubuntu/build.sh | 29 +-------------- web-apache-pgsql/alpine/build.sh | 26 +------------- web-apache-pgsql/centos/build.sh | 29 +-------------- web-apache-pgsql/ubuntu/build.sh | 26 +------------- web-nginx-mysql/alpine/build.sh | 29 +-------------- web-nginx-mysql/centos/build.sh | 29 +-------------- web-nginx-mysql/ubuntu/build.sh | 29 +-------------- web-nginx-pgsql/alpine/build.sh | 26 +------------- web-nginx-pgsql/centos/build.sh | 26 +------------- web-nginx-pgsql/ubuntu/build.sh | 26 +------------- zabbix-appliance/alpine/build.sh | 27 +------------- zabbix-appliance/centos/build.sh | 27 +------------- zabbix-appliance/rhel/Dockerfile | 2 +- zabbix-appliance/rhel/build.sh | 27 +------------- zabbix-appliance/ubuntu/build.sh | 27 +------------- 39 files changed, 99 insertions(+), 973 deletions(-) mode change 100755 => 120000 agent/alpine/build.sh mode change 100755 => 120000 agent/centos/build.sh mode change 100755 => 120000 agent/ubuntu/build.sh create mode 100755 build.sh mode change 100755 => 120000 java-gateway/alpine/build.sh mode change 100755 => 120000 java-gateway/centos/build.sh mode change 100755 => 120000 java-gateway/ubuntu/build.sh mode change 100755 => 120000 proxy-mysql/alpine/build.sh mode change 100755 => 120000 proxy-mysql/centos/build.sh mode change 100755 => 120000 proxy-mysql/ubuntu/build.sh mode change 100755 => 120000 proxy-sqlite3/alpine/build.sh mode change 100755 => 120000 proxy-sqlite3/centos/build.sh mode change 100755 => 120000 proxy-sqlite3/ubuntu/build.sh mode change 100755 => 120000 server-mysql/alpine/build.sh mode change 100755 => 120000 server-mysql/centos/build.sh mode change 100755 => 120000 server-mysql/ubuntu/build.sh mode change 100755 => 120000 server-pgsql/alpine/build.sh mode change 100755 => 120000 server-pgsql/centos/build.sh mode change 100755 => 120000 server-pgsql/ubuntu/build.sh mode change 100755 => 120000 snmptraps/alpine/build.sh mode change 100755 => 120000 snmptraps/centos/build.sh mode change 100755 => 120000 snmptraps/ubuntu/build.sh mode change 100755 => 120000 web-apache-mysql/alpine/build.sh mode change 100755 => 120000 web-apache-mysql/centos/build.sh mode change 100755 => 120000 web-apache-mysql/ubuntu/build.sh mode change 100755 => 120000 web-apache-pgsql/alpine/build.sh mode change 100755 => 120000 web-apache-pgsql/centos/build.sh mode change 100755 => 120000 web-apache-pgsql/ubuntu/build.sh mode change 100755 => 120000 web-nginx-mysql/alpine/build.sh mode change 100755 => 120000 web-nginx-mysql/centos/build.sh mode change 100755 => 120000 web-nginx-mysql/ubuntu/build.sh mode change 100755 => 120000 web-nginx-pgsql/alpine/build.sh mode change 100755 => 120000 web-nginx-pgsql/centos/build.sh mode change 100755 => 120000 web-nginx-pgsql/ubuntu/build.sh mode change 100755 => 120000 zabbix-appliance/alpine/build.sh mode change 100755 => 120000 zabbix-appliance/centos/build.sh mode change 100755 => 120000 zabbix-appliance/rhel/build.sh mode change 100755 => 120000 zabbix-appliance/ubuntu/build.sh diff --git a/agent/alpine/build.sh b/agent/alpine/build.sh deleted file mode 100755 index 4306c449f..000000000 --- a/agent/alpine/build.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -else - MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | cut -f2 -d"="` - MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | cut -f2 -d"."` - - VCS_REF=$MAJOR_VERSION.$MINOR_VERSION -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/agent/alpine/build.sh b/agent/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/agent/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/agent/centos/build.sh b/agent/centos/build.sh deleted file mode 100755 index 4306c449f..000000000 --- a/agent/centos/build.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -else - MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | cut -f2 -d"="` - MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | cut -f2 -d"."` - - VCS_REF=$MAJOR_VERSION.$MINOR_VERSION -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/agent/centos/build.sh b/agent/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/agent/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/agent/ubuntu/build.sh b/agent/ubuntu/build.sh deleted file mode 100755 index 1c45c2ab6..000000000 --- a/agent/ubuntu/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/agent/ubuntu/build.sh b/agent/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/agent/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 000000000..431ce7bd7 --- /dev/null +++ b/build.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +set +e + +if [ ! -f "Dockerfile" ]; then + echo "Dockerfile is missing!" + exit 1 +fi + +os=${PWD##*/} + +version=$1 +version=${version:-"latest"} + +type=$2 +type=${type:-"build"} + +cd ../ +app_component=${PWD##*/} +cd $os/ + +if [ "$app_component" == "zabbix-appliance" ]; then + app_component="appliance" +fi + +if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then + echo "Incorrect syntax of the version" + exit 1 +fi + +if [ "$version" != "latest" ]; then + VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` +else + MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | head -n1 | cut -f2 -d"="` + MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | head -n1 | cut -f2 -d"."` + + VCS_REF=$MAJOR_VERSION.$MINOR_VERSION +fi + +docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . + +if [ "$type" != "build" ]; then + links="" + env_vars="" + + if [[ $app_component =~ .*mysql.* ]]; then + links="$links --link mysql-server:mysql" + env_vars="$env_vars -e MYSQL_DATABASE=\"zabbix\" -e MYSQL_USER=\"zabbix\" -e MYSQL_PASSWORD=\"zabbix\" -e MYSQL_RANDOM_ROOT_PASSWORD=true" + + docker rm -f mysql-server + docker run --name mysql-server -t $env_vars -d mysql:5.7 + fi + + if [ "$links" != "" ]; then + sleep 5 + fi + + docker rm -f zabbix-$app_component + + docker run --name zabbix-$app_component -t -d $links $env_vars zabbix-$app_component:$os-$version +fi \ No newline at end of file diff --git a/java-gateway/alpine/build.sh b/java-gateway/alpine/build.sh deleted file mode 100755 index 47e2404f1..000000000 --- a/java-gateway/alpine/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -docker rm -f zabbix-$app_component -docker run --name zabbix-$app_component -t -d zabbix-$app_component:$os-$version diff --git a/java-gateway/alpine/build.sh b/java-gateway/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/java-gateway/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/java-gateway/centos/build.sh b/java-gateway/centos/build.sh deleted file mode 100755 index 1c45c2ab6..000000000 --- a/java-gateway/centos/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/java-gateway/centos/build.sh b/java-gateway/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/java-gateway/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/java-gateway/ubuntu/build.sh b/java-gateway/ubuntu/build.sh deleted file mode 100755 index 1c45c2ab6..000000000 --- a/java-gateway/ubuntu/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/java-gateway/ubuntu/build.sh b/java-gateway/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/java-gateway/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-mysql/alpine/build.sh b/proxy-mysql/alpine/build.sh deleted file mode 100755 index 70e51a621..000000000 --- a/proxy-mysql/alpine/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version \ No newline at end of file diff --git a/proxy-mysql/alpine/build.sh b/proxy-mysql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-mysql/centos/build.sh b/proxy-mysql/centos/build.sh deleted file mode 100755 index 70e51a621..000000000 --- a/proxy-mysql/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version \ No newline at end of file diff --git a/proxy-mysql/centos/build.sh b/proxy-mysql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-mysql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-mysql/ubuntu/build.sh b/proxy-mysql/ubuntu/build.sh deleted file mode 100755 index 70e51a621..000000000 --- a/proxy-mysql/ubuntu/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version \ No newline at end of file diff --git a/proxy-mysql/ubuntu/build.sh b/proxy-mysql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/alpine/build.sh b/proxy-sqlite3/alpine/build.sh deleted file mode 100755 index 31c356d47..000000000 --- a/proxy-sqlite3/alpine/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/proxy-sqlite3/alpine/build.sh b/proxy-sqlite3/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-sqlite3/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/centos/build.sh b/proxy-sqlite3/centos/build.sh deleted file mode 100755 index 70e51a621..000000000 --- a/proxy-sqlite3/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version \ No newline at end of file diff --git a/proxy-sqlite3/centos/build.sh b/proxy-sqlite3/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-sqlite3/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/proxy-sqlite3/ubuntu/build.sh b/proxy-sqlite3/ubuntu/build.sh deleted file mode 100755 index 31c356d47..000000000 --- a/proxy-sqlite3/ubuntu/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/proxy-sqlite3/ubuntu/build.sh b/proxy-sqlite3/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/proxy-sqlite3/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-mysql/alpine/build.sh b/server-mysql/alpine/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/server-mysql/alpine/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/server-mysql/alpine/build.sh b/server-mysql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-mysql/centos/build.sh b/server-mysql/centos/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/server-mysql/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/server-mysql/centos/build.sh b/server-mysql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-mysql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-mysql/ubuntu/build.sh b/server-mysql/ubuntu/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/server-mysql/ubuntu/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/server-mysql/ubuntu/build.sh b/server-mysql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-pgsql/alpine/build.sh b/server-pgsql/alpine/build.sh deleted file mode 100755 index 0577804cb..000000000 --- a/server-pgsql/alpine/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component-$app_database - -#docker run --name zabbix-$app_component-$app_database -t -d --link postgres-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-pgsql/alpine/build.sh b/server-pgsql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-pgsql/centos/build.sh b/server-pgsql/centos/build.sh deleted file mode 100755 index 0577804cb..000000000 --- a/server-pgsql/centos/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component-$app_database - -#docker run --name zabbix-$app_component-$app_database -t -d --link postgres-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-pgsql/centos/build.sh b/server-pgsql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/server-pgsql/ubuntu/build.sh b/server-pgsql/ubuntu/build.sh deleted file mode 100755 index 0577804cb..000000000 --- a/server-pgsql/ubuntu/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component-$app_database - -#docker run --name zabbix-$app_component-$app_database -t -d --link postgres-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-pgsql/ubuntu/build.sh b/server-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/server-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/snmptraps/alpine/build.sh b/snmptraps/alpine/build.sh deleted file mode 100755 index 5b31ed50f..000000000 --- a/snmptraps/alpine/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d zabbix-$app_component:$os-$version diff --git a/snmptraps/alpine/build.sh b/snmptraps/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/snmptraps/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/snmptraps/centos/build.sh b/snmptraps/centos/build.sh deleted file mode 100755 index 5b31ed50f..000000000 --- a/snmptraps/centos/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d zabbix-$app_component:$os-$version diff --git a/snmptraps/centos/build.sh b/snmptraps/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/snmptraps/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/snmptraps/ubuntu/build.sh b/snmptraps/ubuntu/build.sh deleted file mode 100755 index 5b31ed50f..000000000 --- a/snmptraps/ubuntu/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker run --name zabbix-$app_component -t -d zabbix-$app_component:$os-$version diff --git a/snmptraps/ubuntu/build.sh b/snmptraps/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/snmptraps/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/alpine/build.sh b/web-apache-mysql/alpine/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-apache-mysql/alpine/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-mysql/alpine/build.sh b/web-apache-mysql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/centos/build.sh b/web-apache-mysql/centos/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-apache-mysql/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-mysql/centos/build.sh b/web-apache-mysql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-mysql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-mysql/ubuntu/build.sh b/web-apache-mysql/ubuntu/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-apache-mysql/ubuntu/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-mysql/ubuntu/build.sh b/web-apache-mysql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/alpine/build.sh b/web-apache-pgsql/alpine/build.sh deleted file mode 100755 index 6bfd78182..000000000 --- a/web-apache-pgsql/alpine/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link postgres-server:postgres --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-pgsql/alpine/build.sh b/web-apache-pgsql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/centos/build.sh b/web-apache-pgsql/centos/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-apache-pgsql/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-pgsql/centos/build.sh b/web-apache-pgsql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-apache-pgsql/ubuntu/build.sh b/web-apache-pgsql/ubuntu/build.sh deleted file mode 100755 index 6bfd78182..000000000 --- a/web-apache-pgsql/ubuntu/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link postgres-server:postgres --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-apache-pgsql/ubuntu/build.sh b/web-apache-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-apache-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/alpine/build.sh b/web-nginx-mysql/alpine/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-nginx-mysql/alpine/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-mysql/alpine/build.sh b/web-nginx-mysql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-mysql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/centos/build.sh b/web-nginx-mysql/centos/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-nginx-mysql/centos/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-mysql/centos/build.sh b/web-nginx-mysql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-mysql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-mysql/ubuntu/build.sh b/web-nginx-mysql/ubuntu/build.sh deleted file mode 100755 index bbadc974c..000000000 --- a/web-nginx-mysql/ubuntu/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component -#docker rm -f mysql-server - -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 -#sleep 5 -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-mysql/ubuntu/build.sh b/web-nginx-mysql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-mysql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/alpine/build.sh b/web-nginx-pgsql/alpine/build.sh deleted file mode 100755 index f201358e7..000000000 --- a/web-nginx-pgsql/alpine/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-pgsql/alpine/build.sh b/web-nginx-pgsql/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-pgsql/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/centos/build.sh b/web-nginx-pgsql/centos/build.sh deleted file mode 100755 index f201358e7..000000000 --- a/web-nginx-pgsql/centos/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-pgsql/centos/build.sh b/web-nginx-pgsql/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-pgsql/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/web-nginx-pgsql/ubuntu/build.sh b/web-nginx-pgsql/ubuntu/build.sh deleted file mode 100755 index f201358e7..000000000 --- a/web-nginx-pgsql/ubuntu/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component=${PWD##*/} -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-$app_component - -#docker run --name zabbix-$app_component -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component:$os-$version diff --git a/web-nginx-pgsql/ubuntu/build.sh b/web-nginx-pgsql/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/web-nginx-pgsql/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/alpine/build.sh b/zabbix-appliance/alpine/build.sh deleted file mode 100755 index dd70f7e6c..000000000 --- a/zabbix-appliance/alpine/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component="" -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-appliance - -#sleep 5 -#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version diff --git a/zabbix-appliance/alpine/build.sh b/zabbix-appliance/alpine/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/zabbix-appliance/alpine/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/centos/build.sh b/zabbix-appliance/centos/build.sh deleted file mode 100755 index dd70f7e6c..000000000 --- a/zabbix-appliance/centos/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component="" -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-appliance - -#sleep 5 -#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version diff --git a/zabbix-appliance/centos/build.sh b/zabbix-appliance/centos/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/zabbix-appliance/centos/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 6a4c2e67d..6fc97a8f0 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -13,7 +13,7 @@ ARG VCS_REF ARG MAJOR_VERSION=master ARG RELEASE= -ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE} +ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} diff --git a/zabbix-appliance/rhel/build.sh b/zabbix-appliance/rhel/build.sh deleted file mode 100755 index dd70f7e6c..000000000 --- a/zabbix-appliance/rhel/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component="" -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-appliance - -#sleep 5 -#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version diff --git a/zabbix-appliance/rhel/build.sh b/zabbix-appliance/rhel/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/zabbix-appliance/rhel/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/zabbix-appliance/ubuntu/build.sh b/zabbix-appliance/ubuntu/build.sh deleted file mode 100755 index dd70f7e6c..000000000 --- a/zabbix-appliance/ubuntu/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -os=${PWD##*/} - -version=$1 -version=${version:-"latest"} - -cd ../ -app_component="" -cd $os/ - -if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; then - echo "Incorrect syntax of the version" - exit 1 -fi - -if [ "$version" != "latest" ]; then - VCS_REF=`svn info svn://svn.zabbix.com/tags/$version |grep "Last Changed Rev"|awk '{print $4;}'` -fi - -docker build -t zabbix-appliance:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . - -#docker rm -f zabbix-appliance - -#sleep 5 -#docker run --name zabbix-appliance -t -d -p 80:80 zabbix-appliance:$os-$version diff --git a/zabbix-appliance/ubuntu/build.sh b/zabbix-appliance/ubuntu/build.sh new file mode 120000 index 000000000..fcb4d4ee7 --- /dev/null +++ b/zabbix-appliance/ubuntu/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file