summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
55c6dc7)
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
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
}
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";
}
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
}
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";
}
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
}
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";
}
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
- default:
- driver: bridge
- driver_opts:
- com.docker.network.driver.mtu: ${MTU}
+ default:
+ driver: bridge
+ driver_opts:
+ com.docker.network.driver.mtu: ${MTU}
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- MYSQL_ROOT_HOST=%
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- MYSQL_ROOT_HOST=%
max-size: "30m"
max-file: "5"
max-size: "30m"
max-file: "5"
sdnc:
image: openecomp/sdnc-image:latest
depends_on :
sdnc:
image: openecomp/sdnc-image:latest
depends_on :
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
max-size: "30m"
max-file: "5"
max-size: "30m"
max-file: "5"
web:
image: openecomp/admportal-sdnc-image:latest
depends_on:
- db
container_name: sdnc_portal_container
web:
image: openecomp/admportal-sdnc-image:latest
depends_on:
- db
container_name: sdnc_portal_container
- "/bin/bash"
- "-c"
- "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh"
- "/bin/bash"
- "-c"
- "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh"
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
max-size: "30m"
max-file: "5"
max-size: "30m"
max-file: "5"
dgbuilder:
image: openecomp/dgbuilder-sdnc-image:latest
depends_on:
dgbuilder:
image: openecomp/dgbuilder-sdnc-image:latest
depends_on:
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
max-size: "30m"
max-file: "5"
max-size: "30m"
max-file: "5"
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
}
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";
}
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}