docker updates

smp-docker/compose/tomcat-mysql-smp-sml/README.md

-# Experiamental SMP docker image
-Purpose of compose plan is to startup fully functinal SMP environment for demo and testing. The plan contains 
+# Experimental SMP docker image
+Purpose of compose plan is to startup fully functional SMP environment for demo and testing. The plan contains. 
  - MySql database
  - SML services
  - CAS instance (EULOGIN)
@@ -44,7 +44,6 @@ Users:
 
  To use eulogin add the following hostname mappings (Linux: /etc/hosts, windows: C:\Windows\System32\drivers\etc\hosts
                                                                                  
-                                                                                 and add the lines )
  - 127.0.0.1 eulogin-mock-server
  - 127.0.0.1 eulogin.protected.smp.local
 

smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh

@@ -8,10 +8,8 @@ SML_INIT_DATABASE_DATA="../../../smp-soapui-tests/groovy/mysql-4.1_integration_t
 PREFIX="smp-sml-tomcat-mysql"
 SMP_VERSION=
 
-# clear volume and containers - to run  restart from strach 
 
-
-# READ argumnets 
+# READ arguments
 while getopts i:v: option
 do
   case "${option}"

smp-docker/images/build-docker-images.sh

@@ -36,7 +36,7 @@ SMP_ARTEFACTS="../../smp-webapp/target/"
 SMP_ARTEFACTS_CLEAR="false"
 
 SMP_IMAGE_PUBLISH="false"
-DOCKER_USER=$bamboo_DOCKER_USER
+DOCKER_USER=${bamboo_DOCKER_USER:-edeliverytest}$
 DOCKER_PASSWORD=$bamboo_DOCKER_PASSWORD
 DOCKER_REGISTRY_HOST=${bamboo_DOCKER_REGISTRY_HOST}
 DOCKER_FOLDER=${bamboo_DOCKER_FOLDER:-${bamboo_DOCKER_USER}}

smp-docker/images/oracle/README.md

@@ -4,6 +4,6 @@ Folder contains oracle images needed to build database and weblogic from
 In order to build those images following files must be downloaded from Oracle page
   - OracleDB 11xe: oracle-xe-11.2.0-1.0.x86_64.rpm.zip or   - OracleDB 19c: LINUX.X64_193000_db_home.zip
   - Server JDK 1.8:  server-jre-8u211-linux-x64.tar.gz  (https://github.com/oracle/docker-images/tree/master/OracleJava)
-  - weblogic 12.2.1.3: fmw_12.2.1.3.0_wls_quick_Disk1_1of1.zip
+  - weblogic 12.2.1.4: fmw_12.2.1.4.0_wls_quick_Disk1_1of1.zip
 
 For building docer images check readme files on [Oracle docker git](https://github.com/oracle/docker-images/).

smp-docker/images/tomcat-mysql-smp-sml/Dockerfile

@@ -131,7 +131,7 @@ RUN unzip /tmp/artefacts/smp-setup.zip -d /tmp/    \
     && unzip /tmp/sml-setup.zip -d /tmp/    \
     && mv /tmp/bdmsl-webapp-$SML_VERSION /tmp/sml-setup \
     && cp /tmp/sml-setup/encriptionPrivateKey.private  /opt/smlconf/encriptionPrivateKey.private \
-    && cp /tmp/sml-setup/keystore.jks /opt/smlconf/keystore.jk \
+    && cp /tmp/sml-setup/keystore.jks /opt/smlconf/keystore.jks \
     && mkdir $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp-libs \
     && chmod u+x /sbin/entrypoint.sh
 

smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh

@@ -33,4 +33,4 @@ cp /u01/oracle/init/smp.war "${WL_DOMAIN_HOME}/"
 ls -ltr "${WL_DOMAIN_HOME}/"
 
 # Deploy Application
-wlst.sh -skipWLSModuleScanning /u01/oracle/smp-app-deploy.py
+wlst.sh -skipWLSModuleScanning "${ORACLE_HOME}"/smp-app-deploy.py

smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql

-CREATE SEQUENCE smp_alert_prop_seq START WITH 1 INCREMENT BY 1;
+-- CREATE SEQUENCE smp_alert_prop_seq START WITH 1 INCREMENT BY 1;
 
-CREATE SEQUENCE smp_alert_seq START WITH 1 INCREMENT BY 1;
+-- CREATE SEQUENCE smp_alert_seq START WITH 1 INCREMENT BY 1;
 
 -- set usernames for empty "users"
 
 UPDATE smp_user
 SET
-    username = 'USERNAME_'
-               || lpad(smp_user.id,3,'0')
+    username = 'USERNAME_' || smp_user.id 
 WHERE
     username IS NULL;
 
@@ -214,4 +213,4 @@ SET
     access_token_id = smp_user.username,
     access_token = smp_user.password;
 
-COMMIT;
\ No newline at end of file
+COMMIT;

smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl

 -- ------------------------------------------------------------------------
--- This file was generated by hibernate for SMP version 4.2-RC2-SNAPSHOT.
+-- This file was generated by hibernate for SMP version 5.0-SNAPSHOT.
 -- ------------------------------------------------------------------------
 
 

smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl

 -- ------------------------------------------------------------------------
--- This file was generated by hibernate for SMP version 4.2-RC2-SNAPSHOT.
+-- This file was generated by hibernate for SMP version 5.0-SNAPSHOT.
 -- ------------------------------------------------------------------------
 
 

smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl

 -- ------------------------------------------------------------------------
--- This file was generated by hibernate for SMP version 4.2-RC2-SNAPSHOT.
+-- This file was generated by hibernate for SMP version 5.0-SNAPSHOT.
 -- ------------------------------------------------------------------------
 
 

smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl

 -- ------------------------------------------------------------------------
--- This file was generated by hibernate for SMP version 4.2-RC2-SNAPSHOT.
+-- This file was generated by hibernate for SMP version 5.0-SNAPSHOT.
 -- ------------------------------------------------------------------------
 
 create sequence SMP_ALERT_PROP_SEQ start with 1 increment by  1;