diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scripts/TagSnapshotVersion.groovy | 1 | ||||
| -rw-r--r-- | src/main/yaml/docker-compose.yml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 410b980f..0c3a55b7 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -31,7 +31,6 @@ propertiesFile.withInputStream { project.properties['project.docker.latestminortag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; project.properties['project.docker.latestfulltag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; project.properties['project.docker.latesttagtimestamp.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; // Temporary solution for odl-sodium-alpine dependence in odlsli-alpine image build project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-STAGING-latest"; diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml index 9ed91c69..4a5e57f9 100644 --- a/src/main/yaml/docker-compose.yml +++ b/src/main/yaml/docker-compose.yml @@ -17,7 +17,7 @@ services: odlsli: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on : - db container_name: ccsdk_odlsli_container @@ -38,7 +38,7 @@ services: max-file: "5" dgbuilder: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on: - db container_name: ccsdk_dgbuilder_container |