diff --git a/test.sh b/test.sh new file mode 100644 index 000000000..b13dce3e1 --- /dev/null +++ b/test.sh @@ -0,0 +1,16 @@ +TAGS_ARRAY=() + +IMAGE_NAME="zabbix/zabbix-agent" +RELEASE_VERSION="refs/tags/5.0.3" +RELEASE_VERSION=${RELEASE_VERSION:10} + +GIT_BRANCH=${RELEASE_VERSION%.*} +echo "::debug::Release version ${RELEASE_VERSION}. Branch ${GIT_BRANCH}" +TAGS_ARRAY+=("$IMAGE_NAME:alpine-${RELEASE_VERSION}") + +if [ "alpine" == "alpine" ] && [ "${LATEST_BRANCH}" == "${GIT_BRANCH}" ]; then + TAGS_ARRAY+=("$IMAGE_NAME:latest") + fi +TAGS=$(printf -- "--tag %s " "${TAGS_ARRAY[@]}") + +echo $TAGS \ No newline at end of file diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index a77d4ff6d..f40f53f2a 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -254,10 +254,6 @@ prepare_zbx_web_config() { ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") - ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") - ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 151ae0f63..d539e4727 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -250,10 +250,6 @@ prepare_zbx_web_config() { ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") - ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") - ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 37ed6bb11..d4d7579f4 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -281,10 +281,6 @@ prepare_zbx_web_config() { ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") - ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") - ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 162852189..dad9542a5 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -271,10 +271,6 @@ prepare_zbx_web_config() { ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") - ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") - ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") - sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \