diff options
| -rw-r--r-- | installation/admportal/pom.xml | 2 | ||||
| -rw-r--r-- | installation/dgbuilder/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 2 | ||||
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 42 | ||||
| -rw-r--r-- | installation/ubuntu/pom.xml | 2 |
5 files changed, 25 insertions, 25 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 88ac89d1..c9ea1d90 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 c89c766a..33302bc1 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 b227306a..960d4318 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 cbba1176..bb9acfb2 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 @@ services: 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 @@ services: 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 @@ services: 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 @@ services: 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 d2ff86ad..17f1e0e8 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"; } |