From: Li Zi
Date: Fri, 29 Jun 2018 08:04:38 +0000 (+0000)
Subject: Merge "Dynamically determine image architecture"
X-Git-Tag: 1.2.1~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=7f8d027ddd80f41004ac93b47caa7f7c8721601a;hp=f25d658ef9a096dffe0c47c7d26688bf2476c074
Merge "Dynamically determine image architecture"
---
diff --git a/pom.xml b/pom.xml
index 42abe4b..de026a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
- 1.2.2
+ 1.3.0
1.5.3
2.16
5.0
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 47e85ec..9bffe50 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -243,7 +243,7 @@
${basedir}/target/version/Dockerfile
${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
+ ${project.version}-${maven.build.timestamp}
${project.docker.latesttag.version}
diff --git a/standalone/src/main/assembly/docker/instance_config.sh b/standalone/src/main/assembly/docker/instance_config.sh
index 8987eef..a52335d 100644
--- a/standalone/src/main/assembly/docker/instance_config.sh
+++ b/standalone/src/main/assembly/docker/instance_config.sh
@@ -4,6 +4,6 @@ MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
sed -i "s|msbDiscoveryIp.*|msbDiscoveryIp: $MSB_IP|" /home/esr/conf/extsys.yml
-sed -i "s|msbServerAddr.*|msbServerAddr: http://$MSB_IP:443|" /home/esr/conf/extsys.yml
+sed -i "s|msbServerAddr.*|msbServerAddr: http://$MSB_IP|" /home/esr/conf/extsys.yml
cat /home/esr/conf/extsys.yml