From 4462e4098f6bb74f7997127257431a44193b8a0c Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Fri, 23 Sep 2022 13:48:35 +0200
Subject: [PATCH] docker updates
---
smp-docker/compose/tomcat-mysql-smp-sml/README.md | 5 ++---
smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh | 4 +---
smp-docker/images/build-docker-images.sh | 2 +-
smp-docker/images/oracle/README.md | 2 +-
smp-docker/images/tomcat-mysql-smp-sml/Dockerfile | 2 +-
.../container-scripts/init-scripts/deploySMPToDomain.sh | 2 +-
.../oracle10g-4.1.1_to_4.2.sql | 9 ++++-----
.../smp-setup/database-scripts/mysql5innodb-drop.ddl | 2 +-
.../src/main/smp-setup/database-scripts/mysql5innodb.ddl | 2 +-
.../main/smp-setup/database-scripts/oracle10g-drop.ddl | 2 +-
.../src/main/smp-setup/database-scripts/oracle10g.ddl | 2 +-
11 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/README.md b/smp-docker/compose/tomcat-mysql-smp-sml/README.md
index 4fd5846af..f1dbe604a 100755
--- a/smp-docker/compose/tomcat-mysql-smp-sml/README.md
+++ b/smp-docker/compose/tomcat-mysql-smp-sml/README.md
@@ -1,5 +1,5 @@
-# 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
diff --git a/smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh b/smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
index d307d88e5..580e77db3 100755
--- a/smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
+++ b/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}"
diff --git a/smp-docker/images/build-docker-images.sh b/smp-docker/images/build-docker-images.sh
index 9bf47f9a9..9be88be6a 100755
--- a/smp-docker/images/build-docker-images.sh
+++ b/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}}
diff --git a/smp-docker/images/oracle/README.md b/smp-docker/images/oracle/README.md
index b73cbdce2..9d5577a8f 100644
--- a/smp-docker/images/oracle/README.md
+++ b/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/).
diff --git a/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile b/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
index be14243e4..c3f774207 100755
--- a/smp-docker/images/tomcat-mysql-smp-sml/Dockerfile
+++ b/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
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh
index e3112a4ee..6fbaee5f7 100755
--- a/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh
+++ b/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
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
index f56515042..f23547357 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
@@ -1,13 +1,12 @@
-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;
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl
index 506236cb3..fa190b58b 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl
+++ b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb-drop.ddl
@@ -1,5 +1,5 @@
-- ------------------------------------------------------------------------
--- 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.
-- ------------------------------------------------------------------------
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl
index ceba8f2fe..4ef6624f6 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl
+++ b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innodb.ddl
@@ -1,5 +1,5 @@
-- ------------------------------------------------------------------------
--- 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.
-- ------------------------------------------------------------------------
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl b/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl
index 62558376a..6619045cd 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl
+++ b/smp-webapp/src/main/smp-setup/database-scripts/oracle10g-drop.ddl
@@ -1,5 +1,5 @@
-- ------------------------------------------------------------------------
--- 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.
-- ------------------------------------------------------------------------
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl b/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl
index 7e52f5743..c87600879 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl
+++ b/smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl
@@ -1,5 +1,5 @@
-- ------------------------------------------------------------------------
--- 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;
--
GitLab