diff --git a/.docker/.pycaosdb.ini b/.docker/.pycaosdb.ini new file mode 100644 index 0000000000000000000000000000000000000000..e9c0926658bfec39744c2633f9c0357fd4221f42 --- /dev/null +++ b/.docker/.pycaosdb.ini @@ -0,0 +1,17 @@ +[IntegrationTests] +test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/ + +[Connection] +url=https://caosdb-server:10443 +username=admin +cacert=.docker/cert/caosdb.cert.pem +#cacert=/etc/ssl/cert.pem +debug=0 + +passwordmethod=plain +password=caosdb + +ssl_insecure=True +timeout=500 +[Container] +debug=0 diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 3f4ffd93ea4bd835253baf3c59936908d1ba2ba0..441792ae4c5095ee571b63d412aea83348d21758 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,11 +1,11 @@ FROM debian:latest RUN apt-get update && \ - apt-get install docker.io tox curl python3-pip git -y + apt-get install docker.io tox curl python3-pip git -y RUN pip3 install docker-compose COPY .docker/wait-for-it.sh /wait-for-it.sh RUN git clone https://gitlab.gwdg.de/bmp-caosdb/caosdb-pylib.git && \ cd caosdb-pylib && pip3 install . COPY . /git -RUN rm -r /git/.git +RUN rm -r /git/.git && mv /git/.docker/.pycaosdb.ini /git && /git/.docker/cert /opt/caosdb/cert WORKDIR /git CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox diff --git a/.docker/cert/all-certs.pkcs12 b/.docker/cert/all-certs.pkcs12 new file mode 100644 index 0000000000000000000000000000000000000000..d37f894a6f74d9c6201b40dc5c5a9ba916851881 Binary files /dev/null and b/.docker/cert/all-certs.pkcs12 differ diff --git a/.docker/cert/caosdb.cert.pem b/.docker/cert/caosdb.cert.pem new file mode 100644 index 0000000000000000000000000000000000000000..d9dc93f72f849590984fecf1f23f2cd5cd0a27aa --- /dev/null +++ b/.docker/cert/caosdb.cert.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIC/jCCAeagAwIBAgIJAOKPV7FO5F11MA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV +BAMMCWxvY2FsaG9zdDAeFw0xOTA3MTYxNzMzMDBaFw0xOTA4MTUxNzMzMDBaMBQx +EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAKIUMtnvVUjGsJASzB8+Aco4eRryEYclz1T7bOr8wgiNktbMNkkjHh+e3bUK +RkF9NAneCsplBNFaZJidphVO26aFiGWcSQPcqzpWDTO3CGVUuMhZ1DHw4+opk6bk +uG9Vz/nICpiwUr3sKPSI4ocoZD7ejkw9m2lz+xQIVW54ECL+TUDHscK9GHTmWTe6 +SQP2H2kT5d+vgM2II6coqTCpLwMK2mDg7fRuZjhQJd3xrsSMAnEcjcnsqlZUHFyJ +L00NDvTicTmPywNyU0yH+/SWfS2ahvgjzvtDx4gGKkd1g5PvgrT2sk2vNVI8VJ4B +j1EQ+bRO1jb2jHZ4nP4Fim5J+0cCAwEAAaNTMFEwHQYDVR0OBBYEFPuRQ6UY7aMq +3YQLCf53m913dw3LMB8GA1UdIwQYMBaAFPuRQ6UY7aMq3YQLCf53m913dw3LMA8G +A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIsHIOlD7T9XPtuuj5i7 +tcgf4bnDUAR1mb0XATGrPIKUElYrNQLXjGpu1GZo7qtLJCQsd8c5Q6mVd7UlMte0 +LuwCT6aCNdfvZox90GH9iqP7CeTO6SbgnvXh6YBQXldCj+BXLPLoGvDx5YfB0nAA +mzniiRSCVyqEmbpSDbaEDZZp/dMS8tnwsGPiULi64Xe7ubCaU18GGFC+Vqz3c7pR +Y1OKq8bK+uuhO6S8ByJ6OLFQOGFpSdLdZCiFPGzxm18jJ2EMChRqkNVmhgRC1KBw +MMc5ApzbTBylxeFIM6q8YsJDkM33uiZbytpYsodxCUI4pNIQziRGevc/muZYmtYb +UbI= +-----END CERTIFICATE----- diff --git a/.docker/cert/caosdb.jks b/.docker/cert/caosdb.jks new file mode 100644 index 0000000000000000000000000000000000000000..87dfebc29ac5e27bb79c62452715adba02ba85f4 Binary files /dev/null and b/.docker/cert/caosdb.jks differ diff --git a/.docker/cert/caosdb.key.pem b/.docker/cert/caosdb.key.pem new file mode 100644 index 0000000000000000000000000000000000000000..49a813473f68ee030a61f58c3ce6b16384d0558e --- /dev/null +++ b/.docker/cert/caosdb.key.pem @@ -0,0 +1,30 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-256-CBC,D70EE303F7EC353E496F2860D209E817 + +Hur2pS/YKmBTPUSEH0wcYdFCcrATt4R2b4ivLZQupECUQ4rW/ANJ2wTcwNCRJP62 +F4976iwUjEVhXE4hXZnWv3RfINbPw+wmq/lZbK/q6UtyM7ygZJbgRFwwbE19VoPQ +EcJNFkMYZ0hQuenCru7Vy52LQN6NpAKSPduYI/Yzqo9h8wGOFaNSVB3hlSauDXI0 +/rQK1ndU/IRrzhk0VQV1F+C3pPMkxP59PAGbVB+tY2zXSGvcHVpivERMLuxSjQbx +mv7Pnwj9hW9R/pGU+A2A2CVwr9Xti4SwG+2HYfmQIYeNXmrW4mKBUKDRYnpD5vdt +ppHwF2en4zaKHprSffnc3Qedx2FXo+SJVv5itCIC/iFu/K6ST/MupYsF3E2gzrsm +aa3+/uXOukmhHAP1V2kH2ZIz/BSPZr1mHGf06jNwgXUqajAkvN0t1MfFLzPprO5D +Cl7QJXvQSqiej3XtFH5b0R5hlBha1r1+1/sqFTgOtN8TkcQtmleGM8X6HaRjA9Nl +JCt21LWHhC5V6551nsAbSa6tNp/U3d2a41JojuYPH3XZP97uIAaZDHdjTOOQ3mAm +x4jZxPANGecc86EEUS4GsGQYUmoJ3LWihSyH/oof03Uass0s8b++bvomksS42KkQ +7tURgUmdacpe6nWGri+ovigY0vdAUP2gKMrPNJVOiw1zEEN9nCeFPGm48Xlucm6I +GnP93+yfX1oyohsVE2BL9EH3hjhTxPiUb0NsK7wMolDr929qkbmbLi/YiDeVbfIn +NDuAZVjMjZXamkCHyLo1x+OPWn2PA5kcgrBxoXuH/PQDwWYdeEcd81355Qw0d/NM +NCNorNU1dITMpn8fzlVP3IgpJyFhxvNamxzGLPBU8K9KoMT+Kwzeq7rlepbAk/0G +o9IoQTZmEaFE16v1vKvIaTzhhABrhQ9376zeU7xUB7n5IaU+oqqoK66gCBuMzVHi +FR8YwAg8qOAej76mpdDm7VhbF356VhgpvG6+4OPPPCKWINCGkR1wx2OO57Zxzi7q +EPmPHO4jrcJ4tYalhGSL7bwJucV3bQt8EoMBIwJXyrhAJnyhxP9CAzsnwlZ/2NNz +N4yQhNW+CSJzU7PFEiyZkzGT/Yg6FxpowNKBlZ6Bj5hw7Uc1jEoGYU1EznZJGMTk +MpCl+uep2/VhxxgpGrohaZckmNPlSoYXbliCAKnqaWpCabQlyfrbdURt7zNKUst4 +NHPkeHfJjiXQGDnZ5feI1f2XF74+3BIGIjjX0eiRdO+PnUxXV4ouLwI3Pa79FcXp +t7DTnB7G5wopcHxcmoPGes2mWGvMT/r2InFBb5R3ZXDULqMjBLysq5uWHzfYH1lH +rMndGKOasPIk6eNTFA5FRQOilouV19CxtJB/YWGw2N5S1ps7tBzcNBwsC4hx96PF +NZn7CUzBE0j+jmDib6Oyqx/XBCsEwEU6wYXHFEdZEvhAMRag43/v7bmEr3kOF/FE +8z8ZyvTpkzcYtsnbOuBvsdh8zh/4bW7XX6nxXKNulrNcBTLxWY2Orr/xTKFR8WZ3 +7Z6d2tkjcZPJGxE+dlUgliTuKgV31uHU0rUTkOW313zlsq+uPKrOK+gLgk9AWef3 +-----END RSA PRIVATE KEY----- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 464a1cf53200fceaa96cc8fe7e028487aba53a52..5092166ac0504948e0575c56c63ffda57b4d2134 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,7 @@ test: - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - cd .docker - CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d + - docker cp -a docker_caosdb-server_1:/opt/caosdb/cert/ cert - docker-compose -f tester.yml run tester - rc=$? - docker-compose down