diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/sdnc/src/main/dc-sdnr/docker-compose.yml | 35 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 8 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 4 |
3 files changed, 41 insertions, 6 deletions
diff --git a/installation/sdnc/src/main/dc-sdnr/docker-compose.yml b/installation/sdnc/src/main/dc-sdnr/docker-compose.yml new file mode 100644 index 00000000..3686a808 --- /dev/null +++ b/installation/sdnc/src/main/dc-sdnr/docker-compose.yml @@ -0,0 +1,35 @@ +version: '3' + +services: + sdnr: + image: onap/sdnc-image:latest + container_name: sdnr + environment: + - SDNRONLY=true + - SDNRINIT=true + - SDNRDM=false + - SDNRWT=true + - SDNRDBURL=jdbc:mysql://sdnrdb:3306/sdnrdb + - SDNRDBUSERNAME=sdnrdb + - SDNRDBPASSWORD=sdnrdb + - SDNRDBTYPE=MARIADB + - SDNRCONTROLLERID=c94bbd5f-d456-44bd-aa7a-47b2e4f73253 + # - SDNRWT_BOOTFEATURES=odl-netconf-callhome-ssh,sdnr-wt-feature-aggregator + - ODLUX_REDIRECT_URI=/index.html#/oauth?token= + - HOST_URL=http://localhost:3100 + - ODL_ADMIN_USERNAME=admin + - ODL_ADMIN_PASSWORD=admin + # - OVERRIDE_FEATURES_BOOT=f908aa5a-ca45-4a35-8d23-23aa27422422,odl-restconf-all,odl-netconf-topology,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040 + + depends_on: + - sdnrdb + + sdnrdb: + image: bitnami/mariadb:10.5 + container_name: sdnrdb + environment: + - MARIADB_ROOT_PASSWORD=admin + - MARIADB_DATABASE=sdnrdb + - MARIADB_USER=sdnrdb + - MARIADB_PASSWORD=sdnrdb + - MARIADB_EXTRA_FLAGS=--max_connections=400 diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 15a33d5a..e281d16b 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -8,7 +8,7 @@ ENV PATH $PATH:/opt/java/openjdk/bin ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores -ENV JAVA_SECURITY_DIR /etc/ssl/certs/java +ENV JAVA_SECURITY_DIR /opt/java/openjdk/lib/security ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} @@ -47,11 +47,11 @@ RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckey RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt # Secure with TLS -RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties +#RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties RUN echo org.osgi.service.http.secure.port=$SDNC_SECUREPORT >> $ODL_HOME/etc/custom.properties RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties -RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties -RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties +RUN echo org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties +RUN echo org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/custom.properties # Overwrite svclogic compiler properties RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index cb6e7bb0..b2dbe001 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -332,8 +332,8 @@ if "$SDNC_AAF_ENABLED"; then sed -i '/org.ops4j.pax.web.ssl.password/d' "$ODL_HOME"/etc/custom.properties sed -i '/org.ops4j.pax.web.ssl.keypassword/d' "$ODL_HOME"/etc/custom.properties echo "org.ops4j.pax.web.ssl.keystore=$SDNC_AAF_STORE_DIR/$SDNC_KEYSTORE" >> "$ODL_HOME"/etc/custom.properties - echo "org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties - echo "org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS" >> "$ODL_HOME"/etc/custom.properties + echo "org.ops4j.pax.web.ssl.password=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties + echo "org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\"" >> "$ODL_HOME"/etc/custom.properties fi if $SDNRINIT ; then |