[DOCKER] Update tag
Docker tag should end in -STAGING-latest, and remove invalid characters in docker-compose.yml
Change-Id: I518ea5e6a60f189a38255ee9666d5400b5a5fe2b
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 5e114568fffa29940d6ec4f1554921a78b7d984b
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 88ac89d..c9ea1d9 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -45,7 +45,7 @@
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index c89c766..33302bc 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -46,7 +46,7 @@
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index b227306..960d431 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -69,7 +69,7 @@
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index cbba117..bb9acfb 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -1,10 +1,10 @@
version: '2'
networks:
- default:
- driver: bridge
- driver_opts:
- com.docker.network.driver.mtu: ${MTU}
+ default:
+ driver: bridge
+ driver_opts:
+ com.docker.network.driver.mtu: ${MTU}
services:
@@ -16,13 +16,13 @@
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- MYSQL_ROOT_HOST=%
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
-
-
+
+
sdnc:
image: openecomp/sdnc-image:latest
depends_on :
@@ -38,19 +38,19 @@
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
-
-
+
+
web:
image: openecomp/admportal-sdnc-image:latest
depends_on:
- db
container_name: sdnc_portal_container
- entrypoint:
+ entrypoint:
- "/bin/bash"
- "-c"
- "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh"
@@ -64,13 +64,13 @@
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
-
-
+
+
dgbuilder:
image: openecomp/dgbuilder-sdnc-image:latest
depends_on:
@@ -90,10 +90,10 @@
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
-
-
+
+
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index d2ff86a..17f1e0e 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -45,7 +45,7 @@
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}