diff options
| -rw-r--r-- | dgbuilder-docker/pom.xml | 8 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 10 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/scripts/TagSnapshotVersion.groovy | 11 |
5 files changed, 18 insertions, 15 deletions
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 3bcfff0e..6b88b557 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -183,10 +183,10 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>Dockerfile</dockerFile> <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - <tag>${project.docker.uniquedockertag.version}</tag> + <tag>${project.docker.latestminortag.snapshot.version}</tag> + <tag>${project.docker.latestfulltag.snapshot.version}</tag> + <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> + <tag>${project.docker.uniquedockertag.snapshot.version}</tag> </tags> </build> </image> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 69a5b920..847a4e69 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -606,10 +606,10 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>Dockerfile</dockerFile> <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - <tag>${project.docker.uniquedockertag.version}</tag> + <tag>${project.docker.latestminortag.snapshot.version}</tag> + <tag>${project.docker.latestfulltag.snapshot.version}</tag> + <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> + <tag>${project.docker.uniquedockertag.snapshot.version}</tag> </tags> </build> </image> @@ -657,7 +657,7 @@ </run> </image> <image> - <name>${image.name}:${project.docker.latesttagtimestamp.version}</name> + <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name> <alias>odlsli-container</alias> <run> <env> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index e8fa5ef6..adb686ab 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -17,7 +17,7 @@ COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg FROM ${base.image.name}:${project.docker.latestfulltag.version} -LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" USER root ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties @@ -14,7 +14,7 @@ <packaging>pom</packaging> <name>ccsdk-distribution</name> - <description>Creates distributuon bundles for CCSDK</description> + <description>Creates distribution bundles for CCSDK</description> <modules> <module>platform-logic</module> diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 97014743..410b980f 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -28,7 +28,10 @@ propertiesFile.withInputStream { properties.load(it) } -project.properties['project.docker.latestminortag.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; -project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; -project.properties['project.docker.latesttagtimestamp.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; +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"; |