diff options
| -rw-r--r-- | csit/config/db/db.conf | 1 | ||||
| -rw-r--r-- | policy-db-migrator/pom.xml | 2 | ||||
| -rw-r--r-- | policy-db-migrator/src/main/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | policy-db-migrator/src/main/docker/db-migrator | 6 | ||||
| -rw-r--r-- | policy-jdk/alpine/pom.xml | 2 | ||||
| -rw-r--r-- | policy-jdk/pom.xml | 2 | ||||
| -rw-r--r-- | policy-jre/alpine/pom.xml | 2 | ||||
| -rw-r--r-- | policy-jre/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | releases/2.5.0-container.yaml | 12 | ||||
| -rw-r--r-- | version.properties | 2 |
11 files changed, 27 insertions, 10 deletions
diff --git a/csit/config/db/db.conf b/csit/config/db/db.conf index 22b37f8b..29638c86 100644 --- a/csit/config/db/db.conf +++ b/csit/config/db/db.conf @@ -14,3 +14,4 @@ MYSQL_ROOT_PASSWORD=secret MYSQL_USER=policy_user MYSQL_PASSWORD=policy_user +MYSQL_CMD=mysql diff --git a/policy-db-migrator/pom.xml b/policy-db-migrator/pom.xml index b9c9ab4b..83d18c90 100644 --- a/policy-db-migrator/pom.xml +++ b/policy-db-migrator/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>docker</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <artifactId>policy-db-migrator</artifactId> diff --git a/policy-db-migrator/src/main/docker/Dockerfile b/policy-db-migrator/src/main/docker/Dockerfile index 1860b060..f125088d 100644 --- a/policy-db-migrator/src/main/docker/Dockerfile +++ b/policy-db-migrator/src/main/docker/Dockerfile @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- -FROM onap/policy-jdk-alpine:2.5.0 +FROM onap/policy-jdk-alpine:2.5.1-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy db-migrator" diff --git a/policy-db-migrator/src/main/docker/db-migrator b/policy-db-migrator/src/main/docker/db-migrator index 565ff1c4..3a4ccfa0 100755 --- a/policy-db-migrator/src/main/docker/db-migrator +++ b/policy-db-migrator/src/main/docker/db-migrator @@ -621,7 +621,11 @@ if [ -z "${SQL_HOST}" ] || [ -z "${SQL_USER}" ] || [ -z "${SQL_PASSWORD}" ]; the exit 4 fi -MYSQL="mysql -u${SQL_USER} -p${SQL_PASSWORD} -h ${SQL_HOST}" +if [ -z "$MYSQL_CMD" ]; then + MYSQL_CMD="mysql" +fi + +MYSQL="${MYSQL_CMD} -u${SQL_USER} -p${SQL_PASSWORD} -h ${SQL_HOST}" if ! ${MYSQL} -h"${SQL_HOST}" --execute "show databases;" >/dev/null 2>&1; then echo "error: No DB connectivity to ${SQL_HOST} for ${SQL_USER}" exit 5 diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml index 0adc047e..d29b528e 100644 --- a/policy-jdk/alpine/pom.xml +++ b/policy-jdk/alpine/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>policy-jdk</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml index 479837f7..4a436d1d 100644 --- a/policy-jdk/pom.xml +++ b/policy-jdk/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>docker</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <artifactId>policy-jdk</artifactId> diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml index fcfdcce2..687db69b 100644 --- a/policy-jre/alpine/pom.xml +++ b/policy-jre/alpine/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>policy-jre</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <packaging>pom</packaging> diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml index 8fed3510..21252c87 100644 --- a/policy-jre/pom.xml +++ b/policy-jre/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.docker</groupId> <artifactId>docker</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <artifactId>policy-jre</artifactId> @@ -25,13 +25,13 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>3.6.0</version> + <version>3.6.1-SNAPSHOT</version> <relativePath /> </parent> <groupId>org.onap.policy.docker</groupId> <artifactId>docker</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>policy-docker</name> diff --git a/releases/2.5.0-container.yaml b/releases/2.5.0-container.yaml new file mode 100644 index 00000000..57b46fa3 --- /dev/null +++ b/releases/2.5.0-container.yaml @@ -0,0 +1,12 @@ +distribution_type: 'container' +container_release_tag: '2.5.0' +project: 'policy-docker' +log_dir: 'policy-docker-maven-docker-stage-master/831' +ref: 16b4c43e304b53b0fcfa7ee40247fb88c1ab27ac +containers: + - name: 'policy-jre-alpine' + version: '2.5.0-20220922T1610' + - name: 'policy-jdk-alpine' + version: '2.5.0-20220922T1610' + - name: 'policy-db-migrator' + version: '2.5.0-20220922T1610' diff --git a/version.properties b/version.properties index 756f8a39..50c84cde 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=2 minor=5 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |