diff options
| author |   highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2020-08-28 09:47:07 +0200 |
|---|---|---|
| committer | highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2020-08-28 09:47:39 +0200 |
| commit | 47e466689e8453713d81a010b05c6f6afbfe54f6 (patch) | |
| tree | cc25b9e1ee37879040d19ae08812e03980118ef9 | |
| parent | 137ba19a109014a31d728a734c9706a1a97a9da9 (diff) | |
Remove ccsdk.feature.version and use CCSDKFEATUREVERSION
Issue-ID: SDNC-1332
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I28b079ad0137113e9fd9d3bfb1fe681bdbe25e11
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Former-commit-id: 25b7e1b639066284cb7b06032a2cf6986615c98c
| -rw-r--r-- | installation/sdnc/pom.xml | 1 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 8 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/standalone.Dockerfile | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 0dffcb2f..71047a27 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -26,7 +26,6 @@ <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> <sdnc.northbound.version>2.0.0</sdnc.northbound.version> <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version> - <ccsdk.features.version>1.0.0</ccsdk.features.version> <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore> <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass> <sdnc.secureport>8443</sdnc.secureport> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index d82870b7..b5e834f4 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -28,11 +28,11 @@ ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores ENV SSL_CERTS_DIR /etc/ssl/certs ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java -ENV CCSDKFEATUREVERSION ${ccsdk.features.version} ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features -ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features -ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features -ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features +#CCSDKFEATUREVERSION specified in base image +ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/$CCSDKFEATUREVERSION/xml/features +ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/$CCSDKFEATUREVERSION/xml/features +ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/$CCSDKFEATUREVERSION/xml/features ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} ENV SDNC_SECUREPORT ${sdnc.secureport} diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile index 36407fd8..ebb0d201 100755 --- a/installation/sdnc/src/main/docker/standalone.Dockerfile +++ b/installation/sdnc/src/main/docker/standalone.Dockerfile @@ -28,11 +28,11 @@ ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores ENV SSL_CERTS_DIR /etc/ssl/certs ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java -ENV CCSDKFEATUREVERSION ${ccsdk.features.version} ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features -ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features -ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features -ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features +#CCSDKFEATUREVERSION specified in base image +ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/$CCSDKFEATUREVERSION/xml/features +ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/$CCSDKFEATUREVERSION/xml/features +ENV SDNR_DM_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/$CCSDKFEATUREVERSION/xml/features ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} ENV SDNC_SECUREPORT ${sdnc.secureport} |