From b81d4366e2ed7baf8f30366483a8613145ccb5a3 Mon Sep 17 00:00:00 2001 From: "daniele.pavia" Date: Mon, 13 Nov 2017 16:38:46 +0100 Subject: [PATCH] removed old smartgears-container, a different version will be added later --- .../smartgears-container/defaults/main.yml | 11 ------ ...-scope-maps-1.0.4-4.2.0-128425-patched.jar | Bin 6484 -> 0 bytes smartgears/smartgears-container/meta/main.yml | 3 -- .../smartgears-container/tasks/main.yml | 32 ------------------ .../smartgears-container/templates/Dockerfile | 23 ------------- .../templates/Dockerfile.bckp | 25 -------------- .../templates/d4s.authorization | 1 - 7 files changed, 95 deletions(-) delete mode 100644 smartgears/smartgears-container/defaults/main.yml delete mode 100644 smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar delete mode 100644 smartgears/smartgears-container/meta/main.yml delete mode 100644 smartgears/smartgears-container/tasks/main.yml delete mode 100644 smartgears/smartgears-container/templates/Dockerfile delete mode 100644 smartgears/smartgears-container/templates/Dockerfile.bckp delete mode 100644 smartgears/smartgears-container/templates/d4s.authorization diff --git a/smartgears/smartgears-container/defaults/main.yml b/smartgears/smartgears-container/defaults/main.yml deleted file mode 100644 index 1b9265a5..00000000 --- a/smartgears/smartgears-container/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ -repo: "gcube-staging" -smartgears_version: "2.0.0-4.2.1-133740" -image_name: "smartgears_whn" -image_tag: "{{ smartgears_version }}" -#image_tag: "latest" - - -infrastructure: "d4s" -hostname: "{{ ansible_hostname }}" -token: "24edab1c-6ff6-4c61-8f51-b52d4f5f4611-98187548" -container_mode: "offline" diff --git a/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar deleted file mode 100644 index 15c2afdde8ea7a1d2d038d72b85856941e077fad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6484 zcma)Ac{r5o8=kUcCws^;_I=AzsVqarT3ND%p)vNcpRy-pNrPl9%gI)fFxC#TN0=;G zV?tyt${zZCQ=Q+Lk}-1l=qn~0bZ1OkzPU`1ZgtiZCfMZmum z;GqF=fNWhoBs}3BJ`T2U7nqxoAvuUBkw(Tu*RaRL`x+(a5b+EV2=x6+7gbLaB1H$m zY%x(MrOzC$52fRl9@FiMzAP3kep&`YlH(2{ zivz)6c1a^iMGPDl{zwzT*aA%yc%C`z8ikR(Uc;#~P=l#V*Fb-<^i7gL-jeO>v`+Bh z4^mWk4;ntfdMi5=oEO^HKQL{YpuWU6(xAZg(c>>3p;5MxfiB)|9U8yb-1!TqY{%MyQd zM>@4=2woe}@gKEzhp)S#!RK1u`LnG^=Ts6e!LnN*Uzji@MPJz@8jftxhM()GBc769 zx@rKsSHPDFYMg~6A8r(kFm`JVS6J7^&YNOE|8SA#XRd`65C=a7xLErs0f39WEL16= zO&&h`g@yl1;4@AF!{WpYHo;B$QkH+&m_8#%XPZlH*U&N5blS;$wWCly#~x#oe_mra z#>B&3X2MxRzhy{9FFQWvf7hSViqy-unwNFt)VV%bp*kfAhc%}0 z++Ep0wuYjKrxg#3R`5>0^jd(HIcG^^DNrpraQaL?PTvde>E+;x*jqRlIC|XktM(}x zaN1uJ4N1BmU&ya2Y`nzK6g`mY>hwZ@Kh1dCkKxIi#*$L1j=4>!g2_awPr0uJ}UhI~0KAyFL+$bgKq*B`-OK_E{2Vc|}Y|i*L zw-7x!xrCXfx@53nbj90uC%NX(KWC0>`$1VV`9^>NCV&BY90PD4SNJurz2*O|^<(Q@ z4@(2;Ul9dMoOJmMV(t)T!WWo%sX1rh9cx6BfavL=#5%!zMqhTnC(FIgq1R|MJ7)y= zlLgpL+<(SFrqs!`a~gN$mEL1c!*=kmUA2-G$mmX9)yIJ}BGttj0RhYt z^E3sbU#-rIMg?l|OsiygruT!Sub1>+n><~we6&r9{A7zK!$jPJs}jlDSJ*`6YZuKo zn9nv~KOAwd(N(IpfK7>{XuR;MqML47%7BPgdNxvSKl*gW8A(Wo3xjZQAwb6l@ErX? zhbP?jplqO2C~iv8sShj)hon8}fE079hjC_k^%k}iQzt`Yx+fM3`i4L5E{*RfkYr_` z8wUG`c&C7SP^oW_8?AU$q)T8W`+@jFh-O@Kie}jDyC*O`28PFJn>8}|KOHG8Gu2$5 zj|i;I&&e6d8>ezPt>~iGmcc`X2reIp(Fx7X3@fpmaqEIhjH}n)lnl7rQ|>v|2Rr&_ z%3-z(Pd{BG`7j<7BWp7HPO##`>YF)g!n%b;>DilsniYOtgK%4<=XFmnxXS@ckBKeD z2_gK$nlLy~hvkFbEiY9LdLr5j#m{oj8i3uQR|UDpYE{r^-Vx-t#9Dnz%H?KWxl(N{ zDFHS)otn(N;H$}@9Fvch$6xBnuyo`|P%{m}64I`wmQ~Y5qhJ>3mekr=U4(P5j~Z5- zC2hT8l@{U%h@-Nqfrcw=qr7>zeYe|Q9j4WNOKHxa%YlS$0#Yc~_E&Z}+k*ADh<~V+ zj6ZCXFTWxVkyNnIcw8zS6M9l+TcMlc}Q?Eva4T&Ohf})=ybsERC_> za^^l{hNL-mwU*Oi(1)Vgz$ZD{{L%WsWX?8eN@e)E;=G&iUYcALZqYcoxHn*nF z&^4JLfp$ zRGu%3oVIdId-~C_ zl04&`dbljJxlqLo!L+C+Z~424StVE+7+H5y?MY~n8%#kTTJwCcgq$p za#n{1r-jH9k0c0@^@3jm8bcmq*c4ghx=I->KCXoh57ohV zaHCUwV2dd$?MW(BI}BXT{j~b1zu4P;#W%sassbWAeg^&@Ke~;-m8Db-8ldQ{^}e0p zZQ^cHSfP5v-sfw0>1p4denY50wos4id(~W1OXf|nM|pRf*_EY(Xzhm2hR~$3Z^0hf zXg|N)cr5j9>2PS2m8zR3$W~ub8%n9GLJ9YOo1RpXu*8k6zeS7iJ`J|-HN{r&h;%C- z^1HC+tIqV~*0(cV*65oVV+yFcetq2eQvjucK$u8x==UE#zsP~&b=3`3#G!f`lHc93 z-Emoy_JEvz3Nj~0RhY?(0 z{M}ZAwXTDfqm|L`6(sDv!OSfF=d6;4(MC>e2A89Aozn6)eb=6CX+Yc7Rj!|AdOvcO z!79BN{rU47d-cGG`pv$1pts0@-a-ka25pKzuPzuD^AF~d^0y8Y{Lxzl7JNW&wZuu0 zgx7)1>UG%zYd&qRJzW(fB!-K+$^{ok4*w*^%>(Y{fxLP^Vsudi+Ip0udQ^0Se4@og zH;>Jpvm-ky2-!4T{k$>E6SHt^7ItE~oI0e8c2Ki&b~%cUjA&CY>Igmir&Q;M6h>3` zM2zB)?bRX`L$I1*eKNi4XG5J_RIljq_RQxSy!wFTC8?IUHfh8ANjm&^@LFT=Dc|6~nQ z{J6n$3@DuekQHD+yglGP2Ni{GY^NiUG*u{O(IDBv-%NCfw3d)pxSr{y5n|#|kJ-^~v>t{9Y(6Cu2r_M+d8@(Op@#!vwu`<^& zvEdvf7BN4N^hR9maUh34Sg~C|5aYxv(gM+ppgVF2;li!iHD~hmdJbhPU6@B3SJzW& zXldSo3Q2LMCi`$esxpni?uOMl>qs}|vHF^AjVnR2C>7Bn3y1@8M=NiZUHCVt{ufNg z(-&w1Ms0Q|2^lekSqSw4jGP7-!G$zW7np|^%mWVFPYyEsxb)ag-0%s;ObP=wwOPVQ z&?o}DOvaFOMb=g$TRw6jA+o|sgmqz>YY2<@lrY5>G5WsrqE^b0=sZ1PH$GArT++*( zC%xGzE~VWf`h_f~pyU+yLSa>jy{5YfGV?~4_iNQjc^7Qir}>>Zm-S%#n2gBCz{k%p zsFW$6%;7haHMZ2P26{Y+^_E&~<`AvPmxl3*t54@{NVt9QG(=JRSeZuoB6ord zc7=L3|Nb)S4)#QlbiYBo&U#iFbGqfoa$SsEW#y#y?lDR1@Hf01gLCm=v$jIG>CE>x zK}Z`1#8sHrz69+T;bZHgfV(&x^U;7<@+7|ja2Fd7HnY%4`o;7XlR96rqi?QID0%LK z{MJGHC7{DN0?FBS+x1e2`=5GhSTbJ<%|z%+Y0KNR2%mUG+jh8vaHDkKChSvu@0^C% z*>KmYl6x*Xwoc|LMx*kpzExjMoP&5SefGOhA49Sh@UjV|FILDA#8xP@0yq}$t@s}F zp%>R`=yP9c=+!*f0n-ALU9^%iW1N!01qzN{3h7p{L0Pw!M)e?{}b)^rA9lj)L`XaX1L8#WWsE(YThHx zx;sXXOSC1jNG;V0p-5E)23`ljCyLkjigYkTA$Jnwj1pR)_oJ1%CLr0SafrP9vz+Z1 zSrQ=Bo;Vfywn(;m6?{{>q5_ypJ|*oNQM6ssRHyvrmZPP=} z%a%in^Fqr=RTAm^l3zN=!KRgqEl-;dwi}kC!`!FJMa~U$wmPm;y;HBFVH$BK-x{)# z!e9g4H<#Ri@WW4W(J_D-Y6S|QIsQDRd2oa~R%X<0W@jp5n%oBLJ@c-8lQ_s5MN75} zx$X?-d7naZe(40&Oqk4e(E!EAXG^&OvtL)HSuSWFI?PG*yFC^wzy$~dkO4y9!2R00 z)gt+^)!LKl_hJ$*iSRMk0nGhZM*ofc>&gWmndtC$WP;NJFmVf*e|g(qmm2t(t3NRJ z>jVILpY_IGA_%ty_|WUXHgLb)!GF_$lPzKF#>XWk`Hs6cgdYr+FxBG2?gFs;XWWA! z6NW>47yxLKbr3B$yYyb{tvH#;82@N*>JNf`{``PV(d(D5Y8A5-G zkBg!Lf%bE&2g4;afB3jj)S&&X;K6_iJrq9heHs9GUq^K?WJ2?Sk6c3wAn$8M4u(uP r!ts&2=|KAq^n>9NPDy;+mZP9wX6ElONl0-Mg#q|n1Aev8//" $GHN_HOME/container.xml -RUN sed -ie "s/gcube<\/infrastructure>/{{ infrastructure }}<\/infrastructure>/" $GHN_HOME/container.xml -RUN sed -ie "/<\/infrastructure>/a \ {{ token }}" $GHN_HOME/container.xml - -EXPOSE 8080 - -CMD ./startContainer.sh diff --git a/smartgears/smartgears-container/templates/Dockerfile.bckp b/smartgears/smartgears-container/templates/Dockerfile.bckp deleted file mode 100644 index 8d39cf33..00000000 --- a/smartgears/smartgears-container/templates/Dockerfile.bckp +++ /dev/null @@ -1,25 +0,0 @@ -from openjdk:7 - -ENV GHN_HOME=/SmartGears-Bundle/ -ENV BUNDLE_HOME=$GHN_HOME -ENV CATALINA_HOME=$GHN_HOME/tomcat/ -ENV CATALINA_OPTS="-Xmx2000m -Xms2000m -XX:MaxPermSize=512M" -ENV CATALINA_PID=$CATALINA_HOME/pid.txt - -#WORKDIR $GHN_HOME/ - -RUN \ - wget http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution-bundle/{{ smartgears_version }}/smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \ - && tar xzvf smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \ #--strip-components=1 \ - && rm smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \ - && cd smartgears-distribution-bundle-{{ smartgears_version }} \ - && echo 1 | /bin/bash ./setup.sh -n {{ hostname }} -f \ - && ln -s $GHN_HOME/SmartGears/container.xml $GHN_HOME/container.xml \ - && sed -ie 's/^$CATALINA_HOME\/bin\/startup.sh/$CATALINA_HOME\/bin\/catalina.sh\ run/' startContainer.sh \ - && sed -ie "s///" container.xml \ - && sed -ie "s/gcube<\/infrastructure>/{{ infrastructure }}<\/infrastructure>/" container.xml \ - && sed -ie "/<\/infrastructure>/a \ {{ token }}" container.xml - -EXPOSE 8080 - -CMD /SmartGears-Bundle/startContainer.sh diff --git a/smartgears/smartgears-container/templates/d4s.authorization b/smartgears/smartgears-container/templates/d4s.authorization deleted file mode 100644 index 7e75ea64..00000000 --- a/smartgears/smartgears-container/templates/d4s.authorization +++ /dev/null @@ -1 +0,0 @@ -{{ authorization_hostname }}false{{ authorization_port }}