- original tag variables in pom.xmls are being used also outside
of the poms (namely, in Dockerfiles) and the new tag usage is not
taken in use in all images yet, so the tag names are now
differentiated to support old usage where necessary
- add STAGING-latest tag in TagSnapshotVersion groovy script as a
quick fix for odlsli-alpine dependencies for now
- minor typo corrections
Issue-ID: CCSDK-3019
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ib6b5e275ea305f5871f124da78a6e94b126c0266
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<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>
</tags>
</build>
</image>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<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>
</tags>
</build>
</image>
- <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
+ <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
<alias>odlsli-container</alias>
<run>
<env>
<alias>odlsli-container</alias>
<run>
<env>
FROM ${base.image.name}:${project.docker.latestfulltag.version}
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
USER root
ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
<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>
<modules>
<module>platform-logic</module>
-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";