From d253a759f0cc38af783d0a0c7afbadcd79f1ebc7 Mon Sep 17 00:00:00 2001 From: Soumya Prasad Rana Date: Mon, 22 May 2023 10:42:42 +0530 Subject: [PATCH 1/2] SaaS Deployement Fixes --- VMManagementPortalAPI.war | Bin 12770873 -> 12771995 bytes build.js | 44 ++++++++++++++++--------- portaldb.sql | 2 +- server/api/lists.js | 67 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 16 deletions(-) diff --git a/VMManagementPortalAPI.war b/VMManagementPortalAPI.war index d47d36f1256c78d54065a7f4e5e6074b15287e4b..d4278b9c38a3a182c47d5763da17dd2a57ba959d 100644 GIT binary patch delta 22795 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 delta 21961 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 (4VvvQVlc1mwBdijBokvPmN~$x| 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 L$~0*g!I1nPDcN-U diff --git a/build.js b/build.js index ed978a5..cc43803 100644 --- a/build.js +++ b/build.js @@ -191,25 +191,39 @@ async function createSaaSFiles() { "\n" + 'CMD [ "--max_connections=1000000" ]'; const portal_api_docker_file_data = - `FROM mcr.microsoft.com/powershell:latest - - # Install PowerCLI - RUN pwsh -Command "Install-Module -Name VMware.PowerCLI -Force -AllowClobber" - - # Install default JDK and Apache Tomcat - RUN apt-get update && apt-get install -y default-jdk wget && \ - wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.70/bin/apache-tomcat-8.5.70.tar.gz && \ - tar -xvf apache-tomcat-8.5.70.tar.gz && \ - mv apache-tomcat-8.5.70 /opt/tomcat && \ - rm -rf apache-tomcat-8.5.70.tar.gz - - ` + + `FROM mcr.microsoft.com/powershell:latest` + + "\n" + + `# Install PowerCLI` + + "\n" + + `RUN pwsh -Command "Install-Module -Name VMware.PowerCLI -Force -AllowClobber"` + + "\n" + + `# Install default JDK and Apache Tomcat` + + "\n" + + `RUN apt-get update && apt-get install -y default-jdk wget && \\` + + "\n" + + `wget https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.59/bin/apache-tomcat-9.0.59.tar.gz && \\` + + "\n" + + `tar -xvf apache-tomcat-9.0.59.tar.gz && \\` + + "\n" + + `mv apache-tomcat-9.0.59 /opt/tomcat && \\` + + "\n" + + `rm -rf apache-tomcat-9.0.59.tar.gz ` + + "\n" + "\n" + "COPY files/VMManagementPortalAPI.war /opt/tomcat/webapps/ " + "\n" + - "COPY files/wait-for-it.sh /opt/tomcat/bin/ "; + "COPY files/wait-for-it.sh /opt/tomcat/bin/ " + + "\n" + + "\n" + + "RUN chmod 777 /opt/tomcat/bin/wait-for-it.sh" + + "\n" + + "\n" + + `RUN pwsh -Command "Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:\\$false"` + + "\n" + + `RUN pwsh -Command "Set-PowerCLIConfiguration -WebOperationTimeoutSeconds -1 -Confirm:\\$false"`; + const docker_compose = - 'version: \'3.7\'\n\nservices:\n ui:\n image: portal_ui:1.0\n ports:\n - "3000:3000"\n environment:\n LOG_LEVEL: \'info\'\n APIBASE: http://api:8080/VMManagementPortalAPI\n networks:\n - portal_net\n volumes:\n - logs:/app/server/logs\n depends_on:\n - "api"\n\n api:\n image: portal_api:1.0\n ports:\n - "8080"\n environment:\n JAVA_OPTS : -Xmx1024m -Xms1024m \n DB_NAME : vmportal02\n DB_USER : alex\n DB_PASSWORD : Full@ccess123\n DB_SERVER: db\n DB_USE_SSL: "false"\n networks:\n - portal_net\n depends_on:\n - "db"\n command: ["/opt/tomcat/bin/wait-for-it.sh", "db:3306","-t","300", "--", "/opt/tomcat/bin/catalina.sh", "run"]\n \n db:\n image: portal_db:1.0\n ports:\n - "3306"\n networks:\n - portal_net\n volumes:\n - ./data/db:/var/lib/mysql\nnetworks:\n portal_net:\n driver: bridge\n\nvolumes:\n logs:\n '; + 'version: \'3.7\'\n\nservices:\n ui:\n image: portal_ui:1.0\n restart: always\n ports:\n - "3000:3000"\n environment:\n LOG_LEVEL: \'info\'\n APIBASE: http://api:8080/VMManagementPortalAPI\n networks:\n - portal_net\n volumes:\n - logs:/app/server/logs\n\n api:\n image: portal_api:1.0\n restart: always\n ports:\n - "8080:8080"\n environment:\n JAVA_OPTS : -Xmx1024m -Xms1024m \n DB_NAME : vmportal02\n DB_USER : alex\n DB_PASSWORD : Full@ccess123\n DB_SERVER: db\n DB_USE_SSL: "false"\n networks:\n - portal_net\n command: ["/opt/tomcat/bin/wait-for-it.sh", "db:3306","-t","3000", "--", "/opt/tomcat/bin/catalina.sh", "run"]\n \n db:\n image: portal_db:1.0\n restart: always\n ports:\n - "3306:3306"\n networks:\n - portal_net\n volumes:\n - ./data/mysql:/var/lib/mysql\nnetworks:\n portal_net:\n driver: bridge\n\nvolumes:\n logs:\n '; createFile("./build/docker/saas/portal-ui", "Dockerfile", docker_file_data); createFile( "./build/docker/saas/portal-db", diff --git a/portaldb.sql b/portaldb.sql index 8ae1a2d..3d676df 100644 --- a/portaldb.sql +++ b/portaldb.sql @@ -263,7 +263,7 @@ CREATE TABLE IF NOT EXISTS `vmportal02`.`vm` ( `vm_os` VARCHAR(255) NOT NULL , `vm_os_ver` VARCHAR(255) NOT NULL , `vm_owner` VARCHAR(255) NOT NULL DEFAULT '' , - `vm_comment` VARCHAR(255) NOT NULL DEFAULT '' , + `vm_comment` MEDIUMTEXT NULL DEFAULT NULL, `vm_group` VARCHAR(255) NOT NULL DEFAULT '' , `is_available` TINYINT(1) NOT NULL DEFAULT '1' , `snapshot_count` INT(11) NOT NULL DEFAULT '0' , diff --git a/server/api/lists.js b/server/api/lists.js index c13e229..9f3a4e4 100644 --- a/server/api/lists.js +++ b/server/api/lists.js @@ -185,5 +185,72 @@ module.exports = { text: "Production", }, ], + vmapcomponents: [ + { + value: "UI", + text: "User Interface", + }, + { + value: "SNAPSHOTS", + text: "Snapshots Module", + }, + { + value: "SSHTOOL", + text: "SSH Tools Module", + }, + { + value: "API", + text: "Backend API", + }, + { + value: "DYNAMICOBJECTAPPLICATION", + text: "More Application Module", + }, + { + value: "SPA", + text: "Single Page Application Module", + }, + ], + defecttype: [ + { + value: "DEFECT", + text: "Defect", + }, + { + value: "NEWREQUEST", + text: "New Request", + }, + ], + + defectstatus: [ + { + value: "RESOLVED", + text: "Resolved", + }, + { + value: "NEW", + text: "New", + }, + { + value: "INPROG", + text: "In Progress", + }, + { + value: "PLANNING", + text: "Planning", + }, + { + value: "PENDING", + text: "Pending", + }, + { + value: "CLOSED", + text: "Closed", + }, + { + value: "REOPENED", + text: "Reopened", + }, + ], }, }; From 3e4062e2ab8bde75fde2727d68ab9ee499ee48ac Mon Sep 17 00:00:00 2001 From: Soumya Prasad Rana Date: Mon, 22 May 2023 10:49:25 +0530 Subject: [PATCH 2/2] Copyright fix --- src/app/public/widget/footer/footer.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/public/widget/footer/footer.component.html b/src/app/public/widget/footer/footer.component.html index 2000d25..3bd08fd 100644 --- a/src/app/public/widget/footer/footer.component.html +++ b/src/app/public/widget/footer/footer.component.html @@ -1,5 +1,7 @@ + + VM Assignment Portal 2.0.4 © 2023 All rights reserved. +