From f53e6cc6db3250641fc2a8f854191687dae7c49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org> Date: Tue, 5 Nov 2019 22:50:15 +0100 Subject: [PATCH] MAINT: file location --- .docker/cert/all-certs.pkcs12 | Bin 2389 -> 0 bytes .docker/cert/caosdb.cert.pem | 19 ------------------- .docker/cert/caosdb.jks | Bin 2461 -> 0 bytes .docker/cert/caosdb.key.pem | 30 ------------------------------ .gitlab-ci.yml | 2 ++ 5 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 .docker/cert/all-certs.pkcs12 delete mode 100644 .docker/cert/caosdb.cert.pem delete mode 100644 .docker/cert/caosdb.jks delete mode 100644 .docker/cert/caosdb.key.pem diff --git a/.docker/cert/all-certs.pkcs12 b/.docker/cert/all-certs.pkcs12 deleted file mode 100644 index 382b9cfe7dd1cec7c9f98f96c1fea63a971585ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2389 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 O(OEe?jLn>&QW5}jMQ6DH diff --git a/.docker/cert/caosdb.cert.pem b/.docker/cert/caosdb.cert.pem deleted file mode 100644 index af44eed0..00000000 --- a/.docker/cert/caosdb.cert.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDETCCAfmgAwIBAgIUM1S4TR6nEsstWuXDjZGBv6sb0LAwDQYJKoZIhvcNAQEL -BQAwGDEWMBQGA1UEAwwNY2Fvc2RiLXNlcnZlcjAeFw0xOTA3MTgxNDM3MzNaFw0x -OTA4MTcxNDM3MzNaMBgxFjAUBgNVBAMMDWNhb3NkYi1zZXJ2ZXIwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMFzou21Jugj9Z3YUkhXANt2oGNvuCyt9S -IfBZO5ZpgwSTcRs8UAuKDYAMmGMeQtqLfqEYoQFEeybSd9NsrFb0IgrUaKrSNAzs -phjsGvXU1UbMRw0vva3l6r94ceM8ecw+x2RIsTwfJkfVL60XMm9DvTaQFLzjcKLf -lOQbXG6jgCHtvO5MThk/C+TvsAZlRDErp7HgDqDFg+jnJC5YsEFQQyAYCLJXOotQ -A5FnRbT8dtoDHy03mHyed5Ji3IgxKxE5mF0ygG8/FRfgzqImg4FMnCb+KBwom2xh -y2hvtFnm3+kCbB+waDTUaPZwvNUONUZMfcl3PggX0IwipqWL8DBJAgMBAAGjUzBR -MB0GA1UdDgQWBBSglY56eKgLeyW1o5UdZgqlzDJJEjAfBgNVHSMEGDAWgBSglY56 -eKgLeyW1o5UdZgqlzDJJEjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA -A4IBAQAF4sn/C7wx9fq/9/v6UYb9DbOXaonS+1jOzf1lAOEwHtJh0M9SDTqvaeQz -bshJ33ZFbwH3qIq7+OzGj9Yon9LN1GGEl4CcKKQRQQkjo7jt7X47C6PkrW6l23+i -OrDRk7Oke9BJS/ZRKLmxvlaLYULpj02lOsbddfE4igXxRPCiouosc+HQ3kd6Mqhv -5Gt0Yki3z4fvi+CWrtUjxYeMUJkraFAyKDKwFVZgDnWwyipGo9yh3a6iXD7duQcx -FRk7zm1oaF3ia9hFfU1AVDfkgIlPLWW30CT4Jgi25/wpiGZiT1uXAgfoJCEDoYXp -bQIM5KQqw0Kgjqc/KuLCRe1KeCzq ------END CERTIFICATE----- diff --git a/.docker/cert/caosdb.jks b/.docker/cert/caosdb.jks deleted file mode 100644 index 355b78fd3b60ebdb92b111ee0d81bc6f1adb8add..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2461 zcmXqL;+)CE$ZXKW8N|k^)#lOmotKfFaX}NOGfNYvy+ISFwLueWJc<-+0810Ak3kcw zhd~po3mZ377Y`RB(}E_J-v&)A-wia`xM0GJ%m&gdBI>iQ6wZ=h`nC70uM$V)U!C2W zck`H-84d@qG_jm$EKdG*NTE~z;l1Z?A8d~md9Ezx?)|swn8V3Fp~d`feoVbraM^eb zgSGHed(Ffsu020rUrkV6y}U)@ZCm`V`%GPLHCQ{p6koq}Y&Xw|y%i2>?m6?!c+Ms4 zO6YwVm_L6nhjW?0`HFZ;uXOdE4~eh#w<T${bZk4rcvv@fnX$SXbFQ;oltNVTQucqJ zEAKzmUsCsciTO<fp{B{Y<!8)=7Cd-5>t$Yn|I@hFkq6IhSseUUTqwtrjb&5PYo_#f zrFPu!uh%~=Yc!cPIkHB?c9X;E9TB&+#U}CH)oxg3thDavY=P-}?!VD3_?pP}b=}p% z<NPU-pJe|E@SES6;&DNVk?UySeZISS*@5k0)s^o~?Mit3Y1g+x(Rce7%u;M$r*7($ zHTBlbP0M8*dm7)QosYfM>azRV&+f}rKW=&K^^6PuaCq%4G3nSd)@Kx+S4Ydn>CRTR zV!t{ech<lBsekHA8}}*lt~-3mq&@p_#k%qyhiUir&-CiPW*GeO*3J{JPE2e2df?Q; zW=1W6O@=9KYmeqy8>W<H*nQ>sCsNHR-0+gm@zsW~Ej@h?*Oca;uaPNr^V`ncVdejM zmDLxagDPG!w|gTWsj0?par(q(dFaRkgRh4?7Di8N4VGE>FsyfPv;6LTwi<~pJzgS5 zO!QB>g(#%1Zhd?5<?qgqrq=%ZC$=yf{83?iul`GU=83OfVbPJ9HAh4i)lOA0+hLIZ zud?UweBZ-S6Fnc;>CWZ0=Gwed#q#{hCYSk{Jp1on)itOPTWh~<i?>prU!-X!Thw=# z`Ad&!z5BUCHqU<Q>id}+8}`bHci);lf9JfF_cv(itd{u2J!AjD)t@}>^Eghs{BEPf zl9^U|ms?U;-L5^#{VIB*M{>4i@4Nt$)QYCHpSQ{O&30lg6f`tcXI&NWJonMRex|g= ztDW}xem&fA_wCWE9nHrL<}UMjBCvZ?>D}93{%?`~6*<RB`sCkb`@XGx@s!`<*m+;S zy$6HMp0KYnpP2EUXHum1nkYHd(@{xp{-5=)nEd;5&YH}^o$spl968&!NjTC%VUD}5 zsA5dczOPfRJm}bcK2hLNlHHD~8H=ZFan5?fwd#F|-buse3*NyCZrd}2u-wyHrc~|R z<9gxN+08pou3GtX{!9JL{`#k)Og3$2iuz*2dR;Zn1RE6WGn8EYt%xgOVd?j%`1#cg zYm1XxRdkKC#cek3E17&pVVzfIk|ay&VpZP|<2hkjEKIqKG5cdan1-AcsIswf?Ef*z zOvL<U`Fh2StR+5<GrvA}kzC_Ab>UCf=Mt~{x2c``(UqQ*CjLtB`gip^if0~b@Vi}E zr#9QPB1MMJ=iuG*2gGkUDoJr0tl4KKJT2Rzx|b>1VoH&2g_SPv)z~X~YqkF$_4>c^ zhR?Kf^EEWJSDL9Xb!J=W+~j`LSsuJ8E8}5f=<<k7#)q~?96z)D?Ap$)@n?SM{wTj? zza=N-mQ!-qq6HVXiwgbO7XB#v_J(PXX5U+J(`wF%#Q8rm*=~s+(&v|Ftm82I6L&OS zBQR-7%36-yZY<MSssrX6VqBcp`sDHoc5dD+UB5JQbY5LKsjIv|^{h*Y!&1&OGO20T zR=BS!44IcUGxXJq8)|{M+dZvKxGySszPEDsdcGq2gyg}4<!p-n&Q*(+Oh`0zYZUls z@yO83KoDM3a*7zT$T2Y(8Ym)!L=8n)ghDcNQxyzN&5TXV49rZ8O$`hTnwYP^6|u7| zXktEU(8PR@iIKseiFp@7h7qM)WdoI~JWE_(H`)FF%4NDcvQvO##s$M`r@-ZELlbku z4(pAdvQ~Jl$$h9Nac+&U`{(aISAR?AiSJ#rulZfd4E~MB5+5x%>uHi1^q!?N@w|ZQ z5r&qu|6PUu8BfaA|J31p-L~>5=gEVjZ8L>fCdM`VnDlb~R<YmB`Q~ATH}7yVlq>Mg z_b%N(xvP=Wtkc!)P3g6T@q8u!UvK>9GAqpX*2Rg+sy7y@xLj&mx2t?vcG}*wc+msi zK?QpZ{X6eXsb8IzyI95dAE#EeicN3E?7Xg%DM#2BEBoAz<-DgobH(Yqf2?jQNqz3D zSFY>(p8fvM#E!<PiXkO6I$xK6&6}av-#={;OXHE9Q5Vy<rF0r><?7xu!J^*h{fR{k zd*4YGJev0}=uhNVp1!G@F7ozE)a>@!_o0FD%Yo(`wYas{=bUA5o*PlYzj^iCv!ZjH zFCCooRO7GK58cYLpAmh3KPdFMbuUaa?|-xJ!;kAxM*{m=MDPFju&nB0*o(#mH(zvT zT3#ugvd(wT2A5zh{hg|dYL;y(4DwOWR7;+CXzrhl;%P0M=cTHcUe!-cZl9T%cPMhD zx`Tp|OW5U_)tk+vy(8;3Y&+|wdTUD3FaCz|8M9>7^R~t<U{KuUxcO~i%zpj@=S&h$ z@Eg1f6faJhc-yT_@xz4!E?$g=$$Fb^{h9GqvVrIB(~Q>FLXz`UJ%8@m%igqUl2b>F zzWT16Tk;aLrt!#ZVf5+{(v;f4rM;qL-wl)96`ZUlyN~4<cw6LDGi7z(WtyE8qV#>* zS2^oSFAJ78cMeD1_1^Z(`>~Xp^D@_l^k#Q9jW?4F?#-HQy?fz_FZX8}e%tr6dRy#4 z<GqSew|{<}BY22U=}PEP)kGU5b+ZfaXGGTi-P68-;U1gyDHo-Hm9o4kX^qcK8PhD4 z`)$(x-R?BlHD~ws=z6Zbym2OLW<OUnVe#Jn-nh)YCS2)`#HGHhC9y5vuI|iL^1IB< z9M-6~?1!Rrdr0QK@MLD&^=W&>;}++KO<kwIQ@Tt-Ei)nGf#=hNs@hG0o$s^eT(n{8 z;?&O#Eqh&iTC|d@<Zi3>+U>j5W2(12bNDdzc<Do%O&6vtdH%#oCg9AKGfxg!H@Nc0 ztXz1h;iN449`EmGt_1$NvfB1u(TuaF3Ra)sIw*39<CMbT7k|ziUevlka@F}meOq-- ztbBZTn^GCG4_j2hN2mI`!K>t--_n*TZux0y^L0sK<RQkukf#DndtE+QmMZR3&(Y!d zv+eaYgFi`D26hID2ApiH+I-ARQmhOtBJ;U&<8I!V&b%=2a?wlfo8~L6k7Tfjd^mVw bo=eKfsPl5c(<N2n!?JH&`NPD_*tP%w5B7a| diff --git a/.docker/cert/caosdb.key.pem b/.docker/cert/caosdb.key.pem deleted file mode 100644 index 3459474b..00000000 --- a/.docker/cert/caosdb.key.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: AES-256-CBC,0B42601A73984CD9F1DF2F786F894EA0 - -5ZY5CR8ho3a9449XIUmSpIsCZZWsVQ1pWX+SJPSUlk2A9N3BHdY0AdvCx+sTF7p4 -bSoAulnAEFlIeXqimtK+InH0d3HLbvn41gvEbFTPjZdejxro6m9DvSHCpyDZK9TH -m5A2aRsJioeibETUA7uvld/d9Szdz//GPN2YzWqJpzXZtTWHH/tR2J2L6KE+wBDa -IViryBCv0+9e6l2WeEjXqqYZhznR/gUsxc2xEs7x8wEpWBVlmVzYWuSt7OA5oOm/ -r1OAR9LEH0PIISUv2h+P7ccOZJD/JE2YDM3IBdClxLv2MRyj/88ougcV5gv688+f -6XxT2+LfCLd+viqGcFZ5a6tT1wpUthVWWvUWPna6SlVVrsj/7bCc6y2Jptff+Kqv -eL8Gl1dWZXwe0JXr+Ss5KfIddbY0pJv8FHjCsN+Nkdozo7Wdufm1Xkw+s1f2td6u -bHwbo1Y4mX5nm9I2OkAMhGubSPalGZRUvr9cfl1/1V/QgX0jPmJmNmH5yFUdc5MQ -QIdcpZmz8xIH1XAdJWTbzoYKzKnXTHpZFaZL1acMrK2CERMxDStfe9W/DSRy6/qn -AsQbh6tDk+Fe05EQwpZBZQ1YlrfAru7QDaDE9+uO+mxkf1UHynfPHNp2jZAe6XBt -p97GXUruLR8rBOAGX19EuoG2sSek44dLW5IsLGbR1MpTlq48YZv2z3TrESNJHKAM -VAxg5kwqvYocykdFrKmggbdBv3oo6g59RxiufKparlkI7YZFhks6V1gujKW+JChc -Eoy8e2EJJP0pY0Pb3ZE9QkK7ZX4otXNRgqqnf2f7kTiGMRBSDSD5xGUw0syXAS3G -Ji/4pMFh8ALsYUOOOYUISWAUB6O8/438SIq+g+TNHYVbrli/WK9ip0+RGPmJ+Ulm -iWQMQOcsSYTBqDytvr0241JDBuq9RjMBJE4FO2ltr7L4gmkN8+d/WGnvu4onJBoE -8ApriArJjuHBP1iex3uygJKD3sdiuAuukrPlEla1xjywH3QSzj/SWABIu4QJAr3a -70jEFGL04eblvBPGN2hnXEQCxHqRJLpFH1huWMlO3PuoRnGxIuxymkEOOEWfswLO -r9qLbkUWmFFFqJBNB3T4kfzuZDqiCQnS8+QNvhTiKCWLcUswXTirSac8B5cWDaqd -/Nf119n3ezZkpzgKr0kw+kLxlU2Tbl7UBZ7TRadxklXaAmEo7z+Wh7WKmbcUMqit -xh6P7P0ZWcLYIiXCC5gYr6jzU+Rjx4ZGF5+Q0LcXC3Ai6Ujz4zdrVRLBiw27zKgB -RsYBCYRmQ2qO0AzHFBWixl7IVGYi+QFKU0SFrPLzme+yOJjjLAv2Xzu24KFiwHLz -8MWCd0yM8UjXAql+jCk54O6e4QwER2Rfr6vxlH6x90diy8eJQXejBEVNIfyOpyST -Mqn2jc5vWanVxRk/SgrZ0pOJ8TBeGSzolJF9MBPjZ9PJTbu3WzJpuguQ4CeAAV7E -0+rbPGALnuDKmrsnyIb9WX+fEpT7oBPEKV84XyG1+UkBrfDaQvK3SujeRvnOaZLG -uSNc8yX9CZmt2OJTRWK5fKnR5fGzAnMR7cRUYNvcWJ0T6B4wj8cwF4wY9laGzMO7 ------END RSA PRIVATE KEY----- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 454bac96..6df21a92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,9 @@ test: - docker pull $CI_REGISTRY_IMAGE:latest - EXEPATH=`pwd` CAOSDB_TAG=$CAOSDB_TAG docker-compose -f .docker/docker-compose.yml up -d + - cd .docker - /bin/sh ./run.sh + - cd .. - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt - docker logs docker_sqldb_1 &> ../mariadb_log.txt - docker-compose -f .docker/docker-compose.yml down -- GitLab