Merge branch 'master' into develop

This commit is contained in:
STAM 2020-01-14 15:57:20 +03:00 committed by GitHub
commit 50a5cd1b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 202 additions and 0 deletions

202
.github/docker-scripts.drawio vendored Normal file
View File

@ -0,0 +1,202 @@
<mxfile host="www.draw.io" modified="2020-01-14T12:50:58.653Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36" etag="-t7lc6yeY3U0qfd7QIWz" version="12.5.1" type="github">
<diagram name="Page-1" id="9f46799a-70d6-7492-0946-bef42562c5a5">
<mxGraphModel dx="1654" dy="865" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" background="#ffffff" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="GupPUEsqrWVPhIxHysfE-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-14" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-13" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="779.53" y="300"/>
<mxPoint x="1024.53" y="300"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-31" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714.53" y="340"/>
<mxPoint x="649.53" y="340"/>
<mxPoint x="649.53" y="380"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-3" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="649.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-3" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-7" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-22" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-30" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="554.53" y="230"/>
<mxPoint x="489.53" y="230"/>
<mxPoint x="489.53" y="470"/>
</Array>
</mxGeometry>
</mxCell>
<UserObject label="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;prod&lt;/span&gt;" treeRoot="1" id="GupPUEsqrWVPhIxHysfE-5">
<mxCell style="whiteSpace=wrap;html=1;align=center;treeFolding=1;treeMoving=1;container=1;recursiveResize=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
<mxGeometry x="489.53" y="140" width="130" height="60" as="geometry"/>
</mxCell>
</UserObject>
<mxCell id="GupPUEsqrWVPhIxHysfE-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-7" target="GupPUEsqrWVPhIxHysfE-39" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="374.53" y="340"/>
<mxPoint x="309.53" y="340"/>
<mxPoint x="309.53" y="380"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-50" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-7" target="GupPUEsqrWVPhIxHysfE-43" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="374.53" y="340"/>
<mxPoint x="309.53" y="340"/>
<mxPoint x="309.53" y="450"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-7" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;prod&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk8&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="309.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-11" value="&lt;span style=&quot;white-space: nowrap&quot;&gt;&lt;b&gt;teamcity-agent&lt;/b&gt;&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="979.53" y="420" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-13" target="GupPUEsqrWVPhIxHysfE-11" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="1024.53" y="400"/>
<mxPoint x="959.53" y="400"/>
<mxPoint x="959.53" y="450"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-13" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk11&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="959.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-14" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop:jdk8&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="809.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-40" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="GupPUEsqrWVPhIxHysfE-20" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="489.53" y="340" as="sourcePoint"/>
<Array as="points">
<mxPoint x="489.53" y="300"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="GupPUEsqrWVPhIxHysfE-20" target="661J1RdMhrbpdGnhcWUA-2">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-20" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;balancer&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="509.53" y="270" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-22" target="GupPUEsqrWVPhIxHysfE-41" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="224.53" y="340"/>
<mxPoint x="159.53" y="340"/>
<mxPoint x="159.53" y="395"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-47" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-22" target="GupPUEsqrWVPhIxHysfE-42" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="224.53" y="340"/>
<mxPoint x="159.53" y="340"/>
<mxPoint x="159.53" y="450"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-22" target="GupPUEsqrWVPhIxHysfE-44" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="224.53" y="340"/>
<mxPoint x="159.53" y="340"/>
<mxPoint x="159.53" y="520"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-22" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;prod&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;11&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="159.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-30" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;websites&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="509.53" y="440" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-31" value="&lt;span style=&quot;white-space: nowrap&quot;&gt;&lt;b&gt;qbittorrent&lt;/b&gt;&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="669.53" y="350" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-39" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Jira &amp;lt;=8.1&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="329.53" y="350" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-41" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Jira &amp;gt;=8.2&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="179.53" y="350" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-42" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Confl &amp;gt;=7.1&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="179.53" y="420" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-43" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Confl &amp;lt;=7.0&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="329.53" y="420" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-44" value="&lt;b&gt;BitBucket&lt;/b&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="179.53" y="490" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-45" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Zabbix Stack&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
<mxGeometry x="849.53" y="140" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-1" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;NextCloud&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="969.53" y="140" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-2" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;balancer:php7&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" vertex="1" parent="1">
<mxGeometry x="509.53" y="360" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-4" value="&lt;b&gt;Staytus&lt;/b&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxGeometry x="9.53" y="140" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-5" value="&lt;b&gt;balancer:legacy&lt;/b&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxGeometry x="9.53" y="210" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-6" value="&lt;b&gt;ovm&lt;/b&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="9.53" y="280" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-16" value="" style="group" vertex="1" connectable="0" parent="1">
<mxGeometry x="184.82" y="20" width="730" height="70" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-7" value="&lt;p style=&quot;margin: 0px ; margin-top: 4px ; text-align: center&quot;&gt;&lt;b&gt;Legend&lt;/b&gt;&lt;/p&gt;&lt;hr size=&quot;1&quot;&gt;&lt;div style=&quot;height: 2px&quot;&gt;&lt;/div&gt;" style="verticalAlign=top;align=left;overflow=fill;fontSize=12;fontFamily=Helvetica;html=1;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry width="730" height="70" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-8" value="deprecated" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="10" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-9" value="experemental" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="130" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-10" value="forked 3rd-party" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="250" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-11" value="fork of internal" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="489.53" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-12" value="base image" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="369.53" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-13" value="regular container" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="661J1RdMhrbpdGnhcWUA-16">
<mxGeometry x="609.53" y="30" width="110" height="30" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>

BIN
.github/docker-scripts.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB