Merge "Pin jnr-unixsocket for Docker plugin to 0.13"

diff --git a/pom.xml b/pom.xml
index 42abe4b..de026a3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     </modules>
        
        <properties>
-        <dropwizard.version>1.2.2</dropwizard.version>
+        <dropwizard.version>1.3.0</dropwizard.version>
         <swagger.version>1.5.3</swagger.version>
         <jersey.version>2.16</jersey.version>
         <jaxrs.consumer.version>5.0</jaxrs.consumer.version>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index 47e85ec..9bffe50 100644 (file)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -243,7 +243,7 @@
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}-${maven.build.timestamp}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
                                         </tags>
                                     </build>

diff --git a/standalone/src/main/assembly/docker/instance_config.sh b/standalone/src/main/assembly/docker/instance_config.sh
index 8987eef..a52335d 100644 (file)
--- 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