[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";
 								}