From 08cd59db300f393e818f33e8529155b461d5123c Mon Sep 17 00:00:00 2001 From: Snehal Maid Date: Wed, 2 Oct 2024 15:32:51 -0400 Subject: [PATCH] 6.0.0 version release --- admin-api/package.json | 2 +- docker/.DS_Store | Bin 0 -> 6148 bytes docker/v1/.DS_Store | Bin 0 -> 6148 bytes docker/v1/build_docker.sh | 14 ++++ docker/v1/build_package.sh | 48 +++++++++++ .../config/keymaker-certificate/neo4j.com.crt | 27 +++++++ .../config/keymaker-certificate/neo4j.com.key | 27 +++++++ docker/v1/config/keymaker-license/license.lic | 1 + .../v1/config/keymaker-ui-nginx/neo4j.com.crt | 27 +++++++ .../v1/config/keymaker-ui-nginx/neo4j.com.key | 27 +++++++ docker/v1/config/keymaker-ui-nginx/nginx.conf | 56 +++++++++++++ docker/v1/config/keymaker-ui/env-config.js | 14 ++++ .../config/whitelist/whitelisted-origins.txt | 0 docker/v1/docker-compose.yml | 76 ++++++++++++++++++ docker/v1/getVersion.sh | 24 ++++++ docker/v1/keymaker.sh | 38 +++++++++ docker/v1/keymaker/.DS_Store | Bin 0 -> 6148 bytes docker/v1/keymaker/admin-api/build.sh | 30 +++++++ docker/v1/keymaker/admin-api/cleanup.sh | 9 +++ .../v1/keymaker/admin-api/package-lock.json | 3 + docker/v1/keymaker/build.sh | 42 ++++++++++ docker/v1/keymaker/engine-api/build.sh | 30 +++++++ docker/v1/keymaker/engine-api/cleanup.sh | 9 +++ .../v1/keymaker/engine-api/package-lock.json | 3 + docker/v1/keymaker/ui/build.sh | 31 +++++++ docker/v1/keymaker/ui/cleanup.sh | 9 +++ docker/v1/keymaker/ui/nginx.conf | 21 +++++ docker/v1/keymaker/ui/package-lock.json | 3 + engine-api/package.json | 2 +- ui/package.json | 2 +- ui/src/version.js | 2 +- 31 files changed, 573 insertions(+), 4 deletions(-) create mode 100644 docker/.DS_Store create mode 100644 docker/v1/.DS_Store create mode 100644 docker/v1/build_docker.sh create mode 100644 docker/v1/build_package.sh create mode 100644 docker/v1/config/keymaker-certificate/neo4j.com.crt create mode 100644 docker/v1/config/keymaker-certificate/neo4j.com.key create mode 100644 docker/v1/config/keymaker-license/license.lic create mode 100644 docker/v1/config/keymaker-ui-nginx/neo4j.com.crt create mode 100644 docker/v1/config/keymaker-ui-nginx/neo4j.com.key create mode 100644 docker/v1/config/keymaker-ui-nginx/nginx.conf create mode 100644 docker/v1/config/keymaker-ui/env-config.js create mode 100644 docker/v1/config/whitelist/whitelisted-origins.txt create mode 100644 docker/v1/docker-compose.yml create mode 100755 docker/v1/getVersion.sh create mode 100644 docker/v1/keymaker.sh create mode 100644 docker/v1/keymaker/.DS_Store create mode 100755 docker/v1/keymaker/admin-api/build.sh create mode 100755 docker/v1/keymaker/admin-api/cleanup.sh create mode 100644 docker/v1/keymaker/admin-api/package-lock.json create mode 100755 docker/v1/keymaker/build.sh create mode 100755 docker/v1/keymaker/engine-api/build.sh create mode 100755 docker/v1/keymaker/engine-api/cleanup.sh create mode 100644 docker/v1/keymaker/engine-api/package-lock.json create mode 100755 docker/v1/keymaker/ui/build.sh create mode 100755 docker/v1/keymaker/ui/cleanup.sh create mode 100644 docker/v1/keymaker/ui/nginx.conf create mode 100644 docker/v1/keymaker/ui/package-lock.json diff --git a/admin-api/package.json b/admin-api/package.json index 4ef70bc..d973b03 100644 --- a/admin-api/package.json +++ b/admin-api/package.json @@ -1,6 +1,6 @@ { "name": "keymaker-admin-api", - "version": "5.1.0", + "version": "6.0.0", "description": "API app for Keymaker", "main": "src/index.js", "scripts": { diff --git a/docker/.DS_Store b/docker/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d7c1265d1ec680a148e440d73adf07dfa93b3fe3 GIT binary patch literal 6148 zcmeHKUrWO<5Kp%0GKSCxg*^s*9k@SE6kkf6U%-k!sLYlQE!JkNoqZUCKI<3qllXbO zOHy#UXA!xB|Q;Ud7X5 z;_RNOG!No*I@bwtG=-4c>o|>6;i*L$Wjfb44$%^=iPKpwhlAs;JRFTyUAa6N^gtgT ztyV3uw|{VYF?mX!Q}t@dnK)6W-G^yM^F}O*G zacSdRi={!6&bVF~=CLbRj~A|2hjFRH8Fvj*PYe(P>kQP5>0tdohhJvnBY!=GEMkBd z_-738#@HWwuqj(xe{2tHt%PUhY;mr_*M; zRTE9enbpL!-EeARr`ej#%6wyMd+(@w7xxqSs7Yja<0x4(_y$jCQINU)G9-t4tvWB_)?N9irw~>=pQ}a`A5I?&=;AgI`4|QYd zRu-NCbAotf;VZQTS_Uiw-(`UA2Z2iH8q74Rs{;qs0w5OAtpsiAB`8N2bPZ-2F@nN$ zDxywhro~`79sR>mL|gB>gbzskTX9ln(9 literal 0 HcmV?d00001 diff --git a/docker/v1/build_docker.sh b/docker/v1/build_docker.sh new file mode 100644 index 0000000..a15c7d7 --- /dev/null +++ b/docker/v1/build_docker.sh @@ -0,0 +1,14 @@ +#!/bin/sh +### +### Usage: sh ./build_docker.sh +### This script will run the build.sh file for keymaker & any other directories specified in the args +### +echo "" +echo "*** Cleaning build folder ***" +echo "" +find ./build -exec rm -rdf "{}" \; +mkdir ./build +### Build keymaker +cd ./keymaker +./build.sh +cd .. diff --git a/docker/v1/build_package.sh b/docker/v1/build_package.sh new file mode 100644 index 0000000..84de3f5 --- /dev/null +++ b/docker/v1/build_package.sh @@ -0,0 +1,48 @@ +#!/bin/sh +if [ -z "$KEYMAKER_VERSION" ] +then + echo "KEYMAKER_VERSION must be set first by running command:" + echo " source ./getVersion.sh" + exit 1 +else + echo "KEYMAKER_VERSION is ${KEYMAKER_VERSION}, ok to proceed? (y/n)" + read isVersionOk + if [ "$isVersionOk" != "y" ] + then + echo "Stopping build, re-run when version is ok." + exit 1 + else + echo "Building with KEYMAKER_VERSION ${KEYMAKER_VERSION}" + fi +fi + +### Cleaning build directory +echo "" +echo "*** Cleaning build directory ***" +echo "" +rm -r ./build/* +### Packaging Docker images +echo "" +echo "*** Packaging docker images ***" +echo "" +docker save keymaker-ui:${KEYMAKER_VERSION} keymaker-admin-api:${KEYMAKER_VERSION} keymaker-engine-api:${KEYMAKER_VERSION} | gzip > keymakerDocker.tar.gz +mv keymakerDocker.tar.gz ./build +### Packaging Config +echo "" +echo "*** Packaging Keymaker config ***" +echo "" + +tar --exclude='movies*' -zcvf keymaker_config.tar.gz ./config +mv ./keymaker_config.tar.gz ./build + + +#cp docker-compose.yml ./build/docker-compose.yml +sed 's|${KEYMAKER_VERSION}|'$KEYMAKER_VERSION'|g' docker-compose.yml > ./build/docker-compose.yml +cp ./keymaker.sh ./build/keymaker.sh +cp ../../admin-api/scripts/create-user.sh ./build +echo "" +echo "*** Packaging everything ***" +echo "" +cd ./build +tar cvf keymaker.tar.gz * +echo "*** Done ***" \ No newline at end of file diff --git a/docker/v1/config/keymaker-certificate/neo4j.com.crt b/docker/v1/config/keymaker-certificate/neo4j.com.crt new file mode 100644 index 0000000..4cf528d --- /dev/null +++ b/docker/v1/config/keymaker-certificate/neo4j.com.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqTCCA5GgAwIBAgIJALsY4Ol9rMRoMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD +VQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCVNhbiBNYXRlbzEOMAwGA1UE +CgwFTmVvNGoxEjAQBgNVBAsMCVNvbHV0aW9uczEbMBkGA1UEAwwSY2EubmVvNGou +c29sdXRpb25zMSIwIAYJKoZIhvcNAQkBFhNzb2x1dGlvbnNAbmVvNGouY29tMB4X +DTIxMDQyNjE1MzA1OVoXDTIzMDczMDE1MzA1OVowgZkxCzAJBgNVBAYTAlVTMQsw +CQYDVQQIDAJDQTESMBAGA1UEBwwJU2FuIE1hdGVvMQ4wDAYDVQQKDAVOZW80ajES +MBAGA1UECwwJU29sdXRpb25zMSEwHwYDVQQDDBhrZXltYWtlci5uZW80ai5zb2x1 +dGlvbnMxIjAgBgkqhkiG9w0BCQEWE3NvbHV0aW9uc0BuZW80ai5jb20wggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs4qpVJjPAUQHzZcS1V00p4Jbr9wlq +ir48axQQ1al1OAPxMvPt4CCJNqpymiaHn39gYRnKALQG26ARXdSw9L7LmkV28KeO +U8tns1tf7mlgpoN/nIYGCq6uTeKKvKBV3VWfzLEmEo8Ez0b2nivI11Ymh9z4SVeG +33eM+a28RUCJnAIzTrjRwboT6oYkss8nCuSWd/QxxM19LmIfZGFFAws3WcbjlK0R +asIdYIJCSix4BhoaMK805AB5osYsS4gUtlTtVISJa09Nicl9xOvg5n3Z499Dwbl8 +mbnI2afkyWAIXaDtuMPFs2YIb1ca/pTHsg1t0cf4vhO47X41HJ+tJ8z9AgMBAAGj +gfcwgfQwgbIGA1UdIwSBqjCBp6GBmaSBljCBkzELMAkGA1UEBhMCVVMxCzAJBgNV +BAgMAkNBMRIwEAYDVQQHDAlTYW4gTWF0ZW8xDjAMBgNVBAoMBU5lbzRqMRIwEAYD +VQQLDAlTb2x1dGlvbnMxGzAZBgNVBAMMEmNhLm5lbzRqLnNvbHV0aW9uczEiMCAG +CSqGSIb3DQEJARYTc29sdXRpb25zQG5lbzRqLmNvbYIJAPBWnD/iyK5bMAkGA1Ud +EwQCMAAwCwYDVR0PBAQDAgTwMCUGA1UdEQQeMByCCW5lbzRqLmNvbYIJbG9jYWxo +b3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCCCKIugTyPrTSxmcx1rA7Zk6YQ +yseXgVqV5/i1fyw2/grZWFc2hZeJGVR1CNvh+susBvklfQWF/6rEoCDUqISDJ7Pd +4035rnABIFna0olywszjIkiNQh8TeWHK+aL329aAOWqVYVysGAT2xhKgqnnvsvrz +KAkeCiMuz+BuOWYQ+d+E5hYvilbRxyJ2b4yynS/16Q3oJQXCX0BcQtD2T7ZAjOsN +hUlbIlkhylcRCIVtXNogW4N7TSDqJCT5OrfscMEWI9Ww8RMD6SyA5Z/N894dHdaZ +8GUVlgSzxkByIPzcx4D2AAm+BRJxyXkUtmRnCcUvG67EoDQlnJwkj7fAOOUZ +-----END CERTIFICATE----- diff --git a/docker/v1/config/keymaker-certificate/neo4j.com.key b/docker/v1/config/keymaker-certificate/neo4j.com.key new file mode 100644 index 0000000..e1c9a90 --- /dev/null +++ b/docker/v1/config/keymaker-certificate/neo4j.com.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEArOKqVSYzwFEB82XEtVdNKeCW6/cJaoq+PGsUENWpdTgD8TLz +7eAgiTaqcpomh59/YGEZygC0BtugEV3UsPS+y5pFdvCnjlPLZ7NbX+5pYKaDf5yG +Bgqurk3iirygVd1Vn8yxJhKPBM9G9p4ryNdWJofc+ElXht93jPmtvEVAiZwCM064 +0cG6E+qGJLLPJwrklnf0McTNfS5iH2RhRQMLN1nG45StEWrCHWCCQkoseAYaGjCv +NOQAeaLGLEuIFLZU7VSEiWtPTYnJfcTr4OZ92ePfQ8G5fJm5yNmn5MlgCF2g7bjD +xbNmCG9XGv6Ux7INbdHH+L4TuO1+NRyfrSfM/QIDAQABAoIBAQCSnHHoXco7SDdI +SsBjLFLCtbQnDUsN7/Td1cyhbiATyNoG/LfBvXS6CALJxxHvp4HkoNO265u/yRZY +Q+Mv4Y2/qedIs1LUrxjqqz5M/yicDvmrCXjavMpgBKqeDtJFnrqTFooQCGMCqCi8 +0Wu+GWb0q/jnEYNJXE7M3ZvI8k2Fo8OVr/Ge1AoZjprX+0P5nBQ6Y3suCKD/ZeQJ +HPtwZnOr9qyFZ2OPzD1Ycbp0G0fV+qqAOGy4DzFMDxgSgQKLbLr66h48jUB0YPT4 +c+K1FIy8jkrieskVfxsHsxYoZvJ1kKxekmGoWF0rzg+p51fLstt+xagnkIonwBg2 +o8qcwUBdAoGBANZFVCLRBWPTIBZQ/zh5VzRen9jezdJg2QS3brMCMJtNHcntrjo6 +yXVdKok3JBp86AjkQiA8FdqiZ7v9lQ+kzmv0fTVsLaIxc4F+i61B+UzroFqZic+e +DA1VaunRbebWCpegrFRXfCpSRyX6/Ur+jG8283eZYzCf89w12goVj/0zAoGBAM6O +B2BCLrWyJFy8b1tYqou2MIeeXDwXLMzsNqTyCw+lyyIqJiOUCfF8Doxz31UvPArU +4juF+idtwWvMpC3OHHACehCJHcvomyMLQXdKk4JDJaZCVyVPtFJv4EShXK983cHz +EASScY84uVFmpo+UOkfYQrFt3bSBGP38DdxA8i0PAoGBAISlOJexJBAPNC78h3Lz +kyulZHlCPNJ/B/omgE4rDeImVEmcbR45JFwWh+2YCC6poo9WlyUTbUgDAArdyfh8 +QxmLqjN3O6zLxkClEVz5mZany4YqxKiVo8phVaVX9BxR5w7E9cnkusYMV2VIwqM5 +f8CdmQ0yFLiWXMW3RLq3bIMHAoGAQevqRrpYlfyIxmANWiXuKDC5RE8yOKtczPoG +ZpYpGZFcR0cUbP5uPffN3N2ORW2RyBMxMLYNpE/PD0x8iXHieY0Qz/4y2EUgXgrV +lfDjKwurFGjPz0Sk1DqIZN7q6cb8L04Xqp3iSEdePbB5MBGqmAtZHa9mtpkNFOJA +ui6wG9kCgYEAsDUyPkedVaPJPLINYnaBFPwm3bB50h7qrIorZSzzlOQ+90/9MF3+ +CGJYFK7Fvk+nxrpNQh/fp+dFmSCbwl2NNHPBx7gHA50U/Q9u8fDtxD/GpP7JSzav +Nd3lhcDEpcNjIQ82Cm+2/dWVyOQyVZbpEWmSkYikzV7wmC5cEH6hnJQ= +-----END RSA PRIVATE KEY----- diff --git a/docker/v1/config/keymaker-license/license.lic b/docker/v1/config/keymaker-license/license.lic new file mode 100644 index 0000000..0fb0240 --- /dev/null +++ b/docker/v1/config/keymaker-license/license.lic @@ -0,0 +1 @@ +==== Keymaker 6.0.0 - Labs ==== Uj3ULminMvjRyPkSqktgIhHSXUPCRZ/jZub2JDM3dNwJfxG5/GxCOupIft+7fWAofuxMitbwImpfY8y2tb/OHWt/ujhXSUuUJx4wp6tQl3oLLtt8m+YWCix6kinN8cODzH8Djx/bO1ZWjfTnEiXqusP3UwCnFUkXa4Nvo7nmTQEUS1U4MNtY+Sfsw2I0LOz9m/jBvYD2xULXP54qTGdFIkJwPUDm2t1L7KxaOXRmZ5EMdZItBb77gjiuQeSqLr7ysLu7fXvS8rHSBmkZdT+x442TaueD7SNRSELLb+mweNe69xS1dSZhwA23h0t511X+7oUJd8at1YN/o4ArQQLPeQ==_$$_jTU4Sspeo9sVpPnUHWzkDdElPG0m0LBfEq1xHybZPcmvH/bAqktK+5TP0oYXKxj6aeUePH/xbdl13ybivFvoAw== \ No newline at end of file diff --git a/docker/v1/config/keymaker-ui-nginx/neo4j.com.crt b/docker/v1/config/keymaker-ui-nginx/neo4j.com.crt new file mode 100644 index 0000000..4cf528d --- /dev/null +++ b/docker/v1/config/keymaker-ui-nginx/neo4j.com.crt @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqTCCA5GgAwIBAgIJALsY4Ol9rMRoMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD +VQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCVNhbiBNYXRlbzEOMAwGA1UE +CgwFTmVvNGoxEjAQBgNVBAsMCVNvbHV0aW9uczEbMBkGA1UEAwwSY2EubmVvNGou +c29sdXRpb25zMSIwIAYJKoZIhvcNAQkBFhNzb2x1dGlvbnNAbmVvNGouY29tMB4X +DTIxMDQyNjE1MzA1OVoXDTIzMDczMDE1MzA1OVowgZkxCzAJBgNVBAYTAlVTMQsw +CQYDVQQIDAJDQTESMBAGA1UEBwwJU2FuIE1hdGVvMQ4wDAYDVQQKDAVOZW80ajES +MBAGA1UECwwJU29sdXRpb25zMSEwHwYDVQQDDBhrZXltYWtlci5uZW80ai5zb2x1 +dGlvbnMxIjAgBgkqhkiG9w0BCQEWE3NvbHV0aW9uc0BuZW80ai5jb20wggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs4qpVJjPAUQHzZcS1V00p4Jbr9wlq +ir48axQQ1al1OAPxMvPt4CCJNqpymiaHn39gYRnKALQG26ARXdSw9L7LmkV28KeO +U8tns1tf7mlgpoN/nIYGCq6uTeKKvKBV3VWfzLEmEo8Ez0b2nivI11Ymh9z4SVeG +33eM+a28RUCJnAIzTrjRwboT6oYkss8nCuSWd/QxxM19LmIfZGFFAws3WcbjlK0R +asIdYIJCSix4BhoaMK805AB5osYsS4gUtlTtVISJa09Nicl9xOvg5n3Z499Dwbl8 +mbnI2afkyWAIXaDtuMPFs2YIb1ca/pTHsg1t0cf4vhO47X41HJ+tJ8z9AgMBAAGj +gfcwgfQwgbIGA1UdIwSBqjCBp6GBmaSBljCBkzELMAkGA1UEBhMCVVMxCzAJBgNV +BAgMAkNBMRIwEAYDVQQHDAlTYW4gTWF0ZW8xDjAMBgNVBAoMBU5lbzRqMRIwEAYD +VQQLDAlTb2x1dGlvbnMxGzAZBgNVBAMMEmNhLm5lbzRqLnNvbHV0aW9uczEiMCAG +CSqGSIb3DQEJARYTc29sdXRpb25zQG5lbzRqLmNvbYIJAPBWnD/iyK5bMAkGA1Ud +EwQCMAAwCwYDVR0PBAQDAgTwMCUGA1UdEQQeMByCCW5lbzRqLmNvbYIJbG9jYWxo +b3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCCCKIugTyPrTSxmcx1rA7Zk6YQ +yseXgVqV5/i1fyw2/grZWFc2hZeJGVR1CNvh+susBvklfQWF/6rEoCDUqISDJ7Pd +4035rnABIFna0olywszjIkiNQh8TeWHK+aL329aAOWqVYVysGAT2xhKgqnnvsvrz +KAkeCiMuz+BuOWYQ+d+E5hYvilbRxyJ2b4yynS/16Q3oJQXCX0BcQtD2T7ZAjOsN +hUlbIlkhylcRCIVtXNogW4N7TSDqJCT5OrfscMEWI9Ww8RMD6SyA5Z/N894dHdaZ +8GUVlgSzxkByIPzcx4D2AAm+BRJxyXkUtmRnCcUvG67EoDQlnJwkj7fAOOUZ +-----END CERTIFICATE----- diff --git a/docker/v1/config/keymaker-ui-nginx/neo4j.com.key b/docker/v1/config/keymaker-ui-nginx/neo4j.com.key new file mode 100644 index 0000000..e1c9a90 --- /dev/null +++ b/docker/v1/config/keymaker-ui-nginx/neo4j.com.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEArOKqVSYzwFEB82XEtVdNKeCW6/cJaoq+PGsUENWpdTgD8TLz +7eAgiTaqcpomh59/YGEZygC0BtugEV3UsPS+y5pFdvCnjlPLZ7NbX+5pYKaDf5yG +Bgqurk3iirygVd1Vn8yxJhKPBM9G9p4ryNdWJofc+ElXht93jPmtvEVAiZwCM064 +0cG6E+qGJLLPJwrklnf0McTNfS5iH2RhRQMLN1nG45StEWrCHWCCQkoseAYaGjCv +NOQAeaLGLEuIFLZU7VSEiWtPTYnJfcTr4OZ92ePfQ8G5fJm5yNmn5MlgCF2g7bjD +xbNmCG9XGv6Ux7INbdHH+L4TuO1+NRyfrSfM/QIDAQABAoIBAQCSnHHoXco7SDdI +SsBjLFLCtbQnDUsN7/Td1cyhbiATyNoG/LfBvXS6CALJxxHvp4HkoNO265u/yRZY +Q+Mv4Y2/qedIs1LUrxjqqz5M/yicDvmrCXjavMpgBKqeDtJFnrqTFooQCGMCqCi8 +0Wu+GWb0q/jnEYNJXE7M3ZvI8k2Fo8OVr/Ge1AoZjprX+0P5nBQ6Y3suCKD/ZeQJ +HPtwZnOr9qyFZ2OPzD1Ycbp0G0fV+qqAOGy4DzFMDxgSgQKLbLr66h48jUB0YPT4 +c+K1FIy8jkrieskVfxsHsxYoZvJ1kKxekmGoWF0rzg+p51fLstt+xagnkIonwBg2 +o8qcwUBdAoGBANZFVCLRBWPTIBZQ/zh5VzRen9jezdJg2QS3brMCMJtNHcntrjo6 +yXVdKok3JBp86AjkQiA8FdqiZ7v9lQ+kzmv0fTVsLaIxc4F+i61B+UzroFqZic+e +DA1VaunRbebWCpegrFRXfCpSRyX6/Ur+jG8283eZYzCf89w12goVj/0zAoGBAM6O +B2BCLrWyJFy8b1tYqou2MIeeXDwXLMzsNqTyCw+lyyIqJiOUCfF8Doxz31UvPArU +4juF+idtwWvMpC3OHHACehCJHcvomyMLQXdKk4JDJaZCVyVPtFJv4EShXK983cHz +EASScY84uVFmpo+UOkfYQrFt3bSBGP38DdxA8i0PAoGBAISlOJexJBAPNC78h3Lz +kyulZHlCPNJ/B/omgE4rDeImVEmcbR45JFwWh+2YCC6poo9WlyUTbUgDAArdyfh8 +QxmLqjN3O6zLxkClEVz5mZany4YqxKiVo8phVaVX9BxR5w7E9cnkusYMV2VIwqM5 +f8CdmQ0yFLiWXMW3RLq3bIMHAoGAQevqRrpYlfyIxmANWiXuKDC5RE8yOKtczPoG +ZpYpGZFcR0cUbP5uPffN3N2ORW2RyBMxMLYNpE/PD0x8iXHieY0Qz/4y2EUgXgrV +lfDjKwurFGjPz0Sk1DqIZN7q6cb8L04Xqp3iSEdePbB5MBGqmAtZHa9mtpkNFOJA +ui6wG9kCgYEAsDUyPkedVaPJPLINYnaBFPwm3bB50h7qrIorZSzzlOQ+90/9MF3+ +CGJYFK7Fvk+nxrpNQh/fp+dFmSCbwl2NNHPBx7gHA50U/Q9u8fDtxD/GpP7JSzav +Nd3lhcDEpcNjIQ82Cm+2/dWVyOQyVZbpEWmSkYikzV7wmC5cEH6hnJQ= +-----END RSA PRIVATE KEY----- diff --git a/docker/v1/config/keymaker-ui-nginx/nginx.conf b/docker/v1/config/keymaker-ui-nginx/nginx.conf new file mode 100644 index 0000000..ff98f29 --- /dev/null +++ b/docker/v1/config/keymaker-ui-nginx/nginx.conf @@ -0,0 +1,56 @@ +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + server { + listen 3080; + listen 3443 ssl; + server_name localhost; + ssl_certificate neo4j.com.crt; + ssl_certificate_key neo4j.com.key; + + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + } +} + diff --git a/docker/v1/config/keymaker-ui/env-config.js b/docker/v1/config/keymaker-ui/env-config.js new file mode 100644 index 0000000..2f33894 --- /dev/null +++ b/docker/v1/config/keymaker-ui/env-config.js @@ -0,0 +1,14 @@ +window._dynamicEnv_ = { + REACT_APP_GRAPHQL_URI: "http://localhost:36402/graphql", + REACT_APP_RECOMMENDATION_URI: "http://localhost:36401/graphql", + REACT_APP_EULA_GRAPHQL_URI: "ignore", + REACT_APP_AUTH_DOMAIN: "none", + REACT_APP_AUTH_CLIENT_ID: "none", + REACT_APP_AUTH_CALLBACK: "none", + REACT_APP_AUTH_METHOD: "local", + REACT_APP_AUTH_LOGOUT_URL: "localhost", + REACT_APP_EXPIRE_TIME: "3600", + REACT_APP_HIVE_URI: "", + REACT_APP_HIVE_UI: "", + REACT_APP_SOLUTION: "", +}; diff --git a/docker/v1/config/whitelist/whitelisted-origins.txt b/docker/v1/config/whitelist/whitelisted-origins.txt new file mode 100644 index 0000000..e69de29 diff --git a/docker/v1/docker-compose.yml b/docker/v1/docker-compose.yml new file mode 100644 index 0000000..5116dc8 --- /dev/null +++ b/docker/v1/docker-compose.yml @@ -0,0 +1,76 @@ +version: "1" + +services: + keymaker-admin-api: + image: keymaker-admin-api:${KEYMAKER_VERSION} + ports: + - "36402:4002" + volumes: + - ./config/keymaker-license:/app/license + - ./config/keymaker-certificate:/app/ssh_keys + - ./config/logs:/app/logs + environment: + - LICENSE_FILE=/app/license/license.lic + - NEO4J_URI=neo4j+s://127a9b64.databases.neo4j.io:7687 + - NEO4J_USERNAME=neo4j + - NEO4J_PASSWORD=5YePYymYZzq5Phd39gYnVRPRiVlQL1dgTCAGgNzuoz4 + - NEO4J_DATABASE=neo4j + - GRAPHQL_LISTEN_PORT=4002 + - ENCRYPTION_KEY=keymakerEncryptionKey + - ENGINE_API_APIKEY=LZmIbId7He4dh0hH7ZUVKz5A + - AUTH_METHOD=local + - HOST_NAME=localhost + - HOST_PROTOCOL=http + - LOGS_DIR=/app/logs + - LOG_LEVEL=info + - LOG_MAX_SIZE=20m + - LOG_RETENTION_PERIOD=14d + - MAX_CACHED_DRIVERS=100 + - MAX_DRIVER_AGE=3600000 + - NEO4J_TRANSACTION_TIMEOUT=300000 + - DRIVER_CACHE_PRUNE_INTERVAL=600000 + keymaker-engine-api: + image: keymaker-engine-api:${KEYMAKER_VERSION} + ports: + - "36401:4001" + volumes: + - ./config/keymaker-license:/app/license + - ./config/keymaker-certificate:/app/ssh_keys + - ./config/whitelist:/app/config + - ./config/logs:/app/logs + environment: + - LICENSE_FILE=/app/license/license.lic + - WHITELISTED_ORIGINS_FILE=/app/config/whitelisted-origins.txt + - NEO4J_URI=neo4j+s://127a9b64.databases.neo4j.io:7687 + - NEO4J_USERNAME=neo4j + - NEO4J_PASSWORD=5YePYymYZzq5Phd39gYnVRPRiVlQL1dgTCAGgNzuoz4 + - NEO4J_DATABASE=neo4j + - GRAPHQL_LISTEN_PORT=4001 + - ENCRYPTION_KEY=keymakerEncryptionKey + - HOST_NAME=localhost + - HOST_PROTOCOL=http + - MAX_CACHED_DRIVERS=100 + - MAX_DRIVER_AGE=3600000 + - NEO4J_TRANSACTION_TIMEOUT=300000 + - DRIVER_CACHE_PRUNE_INTERVAL=600000 + - MAX_CACHED_APIKEYS=100 + - APIKEY_CACHE_PRUNE_INTERVAL=600000 + - LOGS_DIR=/app/logs + - LOG_LEVEL=info + - LOG_MAX_SIZE=20m + - LOG_RETENTION_PERIOD=14d + - MAX_CACHED_ENGINES=100 + - MAX_ENGINE_AGE=3600000 + - ENGINE_CACHE_PRUNE_INTERVAL=600000 + - ENGINE_CACHE_RESET_INTERVAL=86400000 + keymaker-ui: + image: keymaker-ui:${KEYMAKER_VERSION} + ports: + - "36081:3080" + - "36444:3443" + volumes: + - ./config/keymaker-ui:/usr/share/nginx/html/config + - ./config/keymaker-ui-nginx:/usr/share/nginx/conf + depends_on: + - "keymaker-engine-api" + - "keymaker-admin-api" diff --git a/docker/v1/getVersion.sh b/docker/v1/getVersion.sh new file mode 100755 index 0000000..dff2790 --- /dev/null +++ b/docker/v1/getVersion.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# Get the directory of the current script +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +# Path to the version.js file +input="$SCRIPT_DIR/../../ui/src/version.js" + +# Check if the input file exists +if [[ ! -f "$input" ]]; then + echo "Error: File $input not found." + return 1 # Use 'return' instead of 'exit' when sourcing +fi + +# Extract the version number using sed +VERSION=$(sed -n "s/export const VERSION = '\([^']*\)';/\1/p" "$input") + +# Replace '-' and '+' with '_' +VERSION=${VERSION//-/_} +VERSION=${VERSION//+/_} + +# Output the version and export it as an environment variable +echo "VERSION: $VERSION" +export KEYMAKER_VERSION=$VERSION \ No newline at end of file diff --git a/docker/v1/keymaker.sh b/docker/v1/keymaker.sh new file mode 100644 index 0000000..af83ee9 --- /dev/null +++ b/docker/v1/keymaker.sh @@ -0,0 +1,38 @@ +#!/bin/sh +doExit () { + echo >&2 "$@" + exit 1 +} + +[ "$#" -eq 1 ] || doExit "Usage: keymaker (start | stop | status | unpack)" +if [ "$1" = "start" ] +then + echo "Starting Keymaker services" + docker-compose --project-name keymaker up --detach --remove-orphans --force-recreate + echo "Keymaker should be available in a few minutes" + echo " Keymaker Admin UI: http://localhost:36081" +elif [ "$1" = "stop" ] +then + echo "Stopping Keymaker services" + docker-compose --project-name keymaker stop +elif [ "$1" = "status" ] +then + echo "Keymaker status" + docker ps | grep keymaker +elif [ "$1" = "unpack" ] +then + if [ -d "./keymaker_config" ] + then + echo "*** Config folder exists. Skipping unpacking of config ***" + else + echo "" + echo "*** Unpacking config ***" + echo "" + tar xvfz keymaker_config.tar.gz + fi + echo "" + echo "*** Unpacking docker images ***" + echo "" + docker load < keymakerDocker.tar.gz + echo "" +fi \ No newline at end of file diff --git a/docker/v1/keymaker/.DS_Store b/docker/v1/keymaker/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..29997ae09e474792fd44be2ba65484ab6192c52c GIT binary patch literal 6148 zcmeHK%}N6?5T3Nv?oxyv6nYGJt=L)>#LH6a3%H^OmAcCoUEFR;f9#1CuYApAGr4WD)=n?Mc)Gr~-h4N?35QSs~;nU6O*e5DNW`6!sv10mR{S zDVhy`kpbE}7xyfJKE&{4|3-r_Q6YNY!a)*`#*N0iC=^Q@n`Ni$RGd5iQBD1EFrJLs z!SIGgmr5mJ-Veg7xHs)qx6f2M4&t;o)CqCa!;stSIE~b_ttM$S(z(8IIIiP%tF_sz zdD5uM<5pu{m$Q@RL0ulUj^=aM+1cGcz34tA{ZzdeItBiDTDC0a@QR%kD|_~bX`<2x z^yZm)1|u`T3@`)h!hk*hoXWZ^nAgb+FatkkfX)YrO6Xb44C>> Removing ./admin-api folder" +./cleanup.sh $1 +# Copy in source code +echo ">>> Copying ./admin-api folder without node_modules" +rsync -av --progress ../../../../admin-api . --exclude node_modules +cd admin-api + +# Install deps +echo ">>> Installing dependencies" +if [ "$1" = "-skipNpmInstall" ] +then + echo ">>> Skipping npm install" + mv ../keep/node_modules . +else + echo ">>> Doing npm install" + npm install +fi +# Copy in empty .env files (vars are specified in docker-compose.yml) +cp ../.env ./.env +cp ../.env ./dist/.env +# Build docker image +echo ">>> Doing docker build" +docker build --no-cache -f Dockerfile ./ -t keymaker-admin-api:${KEYMAKER_VERSION} +# Remove source code +echo ">>> Removing ./admin-api folder" +cd .. +./cleanup.sh $1 \ No newline at end of file diff --git a/docker/v1/keymaker/admin-api/cleanup.sh b/docker/v1/keymaker/admin-api/cleanup.sh new file mode 100755 index 0000000..55fddc6 --- /dev/null +++ b/docker/v1/keymaker/admin-api/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if [ "$1" = "-skipNpmInstall" ] +then + mkdir ./keep + mv ./admin-api/node_modules ./keep + find ./admin-api -exec rm -rdf "{}" \; +else + find ./admin-api -exec rm -rdf "{}" \; +fi diff --git a/docker/v1/keymaker/admin-api/package-lock.json b/docker/v1/keymaker/admin-api/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/docker/v1/keymaker/admin-api/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/docker/v1/keymaker/build.sh b/docker/v1/keymaker/build.sh new file mode 100755 index 0000000..7864877 --- /dev/null +++ b/docker/v1/keymaker/build.sh @@ -0,0 +1,42 @@ +#!/bin/sh +if [ -z "$KEYMAKER_VERSION" ] +then + echo "KEYMAKER_VERSION must be set first by running command:" + echo " source ./getVersion.sh" + exit 1 +else + echo "KEYMAKER_VERSION is ${KEYMAKER_VERSION}, ok to proceed? (y/n)" + read isVersionOk + if [ "$isVersionOk" != "y" ] + then + echo "Stopping build, re-run when version is ok." + exit 1 + else + echo "Building with KEYMAKER_VERSION ${KEYMAKER_VERSION}" + fi +fi + +echo "" +echo "*** Building Keymaker ***" +echo "" +### Build Keymaker Admin API +echo "" +echo "*** Building Keymaker Admin API ***" +echo "" +cd ./admin-api +./build.sh $1 +cd .. +### Build Keymaker Engine API +echo "" +echo "*** Building Keymaker Engine API ***" +echo "" +cd ./engine-api +./build.sh $1 +cd .. +### Build Keymaker UI +echo "" +echo "*** Building Keymaker UI ***" +echo "" +cd ./ui +./build.sh $1 +cd .. \ No newline at end of file diff --git a/docker/v1/keymaker/engine-api/build.sh b/docker/v1/keymaker/engine-api/build.sh new file mode 100755 index 0000000..2ddf8a9 --- /dev/null +++ b/docker/v1/keymaker/engine-api/build.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# Clean dir before build +echo ">>> Removing ./engine-api folder" +./cleanup.sh $1 +# Copy in source code +echo ">>> Copying ./engine-api folder without node_modules" +rsync -av --progress ../../../../engine-api . --exclude node_modules +cd engine-api + +# Install deps +echo ">>> Installing dependencies" +if [ "$1" = "-skipNpmInstall" ] +then + echo ">>> Skipping npm install" + mv ../keep/node_modules . +else + echo ">>> Doing npm install" + npm install +fi +# Copy in empty .env files (vars are specified in docker-compose-all.yml) +cp ../.env ./.env +cp ../.env ./dist/.env +# Build docker image +echo ">>> Doing docker build" +docker build --no-cache -f Dockerfile ./ -t keymaker-engine-api:${KEYMAKER_VERSION} +# Remove source code +echo ">>> Removing ./engine-api folder" +cd .. +./cleanup.sh $1 \ No newline at end of file diff --git a/docker/v1/keymaker/engine-api/cleanup.sh b/docker/v1/keymaker/engine-api/cleanup.sh new file mode 100755 index 0000000..133adda --- /dev/null +++ b/docker/v1/keymaker/engine-api/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if [ "$1" = "-skipNpmInstall" ] +then + mkdir ./keep + mv ./engine-api/node_modules ./keep + find ./engine-api -exec rm -rdf "{}" \; +else + find ./engine-api -exec rm -rdf "{}" \; +fi diff --git a/docker/v1/keymaker/engine-api/package-lock.json b/docker/v1/keymaker/engine-api/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/docker/v1/keymaker/engine-api/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/docker/v1/keymaker/ui/build.sh b/docker/v1/keymaker/ui/build.sh new file mode 100755 index 0000000..025a19b --- /dev/null +++ b/docker/v1/keymaker/ui/build.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Clean dir before build +echo ">>> Removing ./ui folder" +./cleanup.sh $1 +# Copy in source code +echo ">>> Copying ./ui folder without node_modules" +rsync -av --progress ../../../../ui . --exclude node_modules +cd ui +rm ./public/config/env-config.js +rmdir ./public/config +# Install deps +echo ">>> Doing Keymaker UI build" +if [ "$1" = "-skipNpmInstall" ] +then + echo ">>> Skipping npm install" + mv ../keep/node_modules . +else + echo ">>> Doing npm install" + npm install +fi +# Include Nginx config +echo ">>> Overwrite nginx.conf" +cp ../nginx.conf ./nginx.conf +# Build docker image +echo ">>> Doing docker build" +docker build --no-cache -f Dockerfile ./ -t keymaker-ui:${KEYMAKER_VERSION} +# Remove source code +echo ">>> Removing ./ui folder" +cd .. +./cleanup.sh $1 \ No newline at end of file diff --git a/docker/v1/keymaker/ui/cleanup.sh b/docker/v1/keymaker/ui/cleanup.sh new file mode 100755 index 0000000..614b2a0 --- /dev/null +++ b/docker/v1/keymaker/ui/cleanup.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if [ "$1" = "-skipNpmInstall" ] +then + mkdir ./keep + mv ./ui/node_modules ./keep + find ./ui -exec rm -rdf "{}" \; +else + find ./ui -exec rm -rdf "{}" \; +fi diff --git a/docker/v1/keymaker/ui/nginx.conf b/docker/v1/keymaker/ui/nginx.conf new file mode 100644 index 0000000..3f3f9af --- /dev/null +++ b/docker/v1/keymaker/ui/nginx.conf @@ -0,0 +1,21 @@ +server { + listen 3080; + server_name localhost; + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} \ No newline at end of file diff --git a/docker/v1/keymaker/ui/package-lock.json b/docker/v1/keymaker/ui/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/docker/v1/keymaker/ui/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/engine-api/package.json b/engine-api/package.json index 1c7e7a4..59d98c2 100755 --- a/engine-api/package.json +++ b/engine-api/package.json @@ -1,6 +1,6 @@ { "name": "keymaker-engine-api", - "version": "5.1.0", + "version": "6.0.0", "description": "Engine API for Keymaker", "main": "src/index.js", "scripts": { diff --git a/ui/package.json b/ui/package.json index 0122072..b51f5b9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "keymaker-ui", - "version": "5.1.0", + "version": "6.0.0", "description": "UI app for Keymaker", "scripts": { "start": "react-scripts start", diff --git a/ui/src/version.js b/ui/src/version.js index c54bf8d..be6dbcf 100644 --- a/ui/src/version.js +++ b/ui/src/version.js @@ -1,2 +1,2 @@ -export const VERSION = '5.1.0'; \ No newline at end of file +export const VERSION = '6.0.0'; \ No newline at end of file