Merge branch 'develop'

This commit is contained in:
STAM 2022-09-13 15:08:36 +03:00
commit a073015241
Signed by: stam
GPG Key ID: E149C3760CFA3C7E
6 changed files with 264 additions and 279 deletions

View File

@ -1,8 +0,0 @@
version: 2
updates:
- package-ecosystem: docker
directory: "/atlassian/jira/latest"
schedule:
interval: daily
time: "02:00"
open-pull-requests-limit: 10

View File

@ -1,268 +1 @@
<mxfile host="www.draw.io" modified="2020-02-02T01:01:58.312Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="aOQb0ZikZe3zj6RUf5Rq" version="12.6.2" type="github"> <mxfile host="app.diagrams.net" modified="2022-09-13T11:37:27.902Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36" etag="MttYzcDne4kYzzQ_zI3m" version="20.2.5" type="device"><diagram name="Page-1" id="9f46799a-70d6-7492-0946-bef42562c5a5">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</diagram></mxfile>
<diagram name="Page-1" id="9f46799a-70d6-7492-0946-bef42562c5a5">
<mxGraphModel dx="1406" dy="744" 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">
<Array as="points">
<mxPoint x="874" y="620"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="GupPUEsqrWVPhIxHysfE-13" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="779.53" y="620"/>
<mxPoint x="1024.53" y="620"/>
</Array>
<mxPoint x="780" y="620" as="sourcePoint"/>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-20" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="720" y="580" as="sourcePoint"/>
<Array as="points">
<mxPoint x="714" y="590"/>
<mxPoint x="805" y="590"/>
<mxPoint x="805" y="460"/>
</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="600" 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="wDtG2ugJA-Ccp97bahZy-3" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="730" y="200" as="targetPoint"/>
</mxGeometry>
</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" target="GupPUEsqrWVPhIxHysfE-30" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="490" y="340"/>
<mxPoint x="490" y="390"/>
</Array>
<mxPoint x="710" y="340" as="sourcePoint"/>
</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="375" y="340"/>
<mxPoint x="310" y="340"/>
<mxPoint x="310" y="460"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="BSTWsPW5K0Pz7Seea1G_-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="BSTWsPW5K0Pz7Seea1G_-1" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="310" y="350" as="sourcePoint"/>
<Array as="points">
<mxPoint x="310" y="540"/>
</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="829.53" y="750" 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-14" target="GupPUEsqrWVPhIxHysfE-11" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="875" y="720"/>
<mxPoint x="810" y="720"/>
<mxPoint x="810" y="780"/>
</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="640" 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="640" width="130" height="60" as="geometry"/>
</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;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-20" target="661J1RdMhrbpdGnhcWUA-2" edge="1">
<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="669.53" y="430" 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.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-22" target="GupPUEsqrWVPhIxHysfE-41" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="225" y="340"/>
<mxPoint x="160" y="340"/>
<mxPoint x="160" y="380"/>
</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="225" y="340"/>
<mxPoint x="160" y="340"/>
<mxPoint x="160" y="460"/>
</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="225" y="340"/>
<mxPoint x="160" y="340"/>
<mxPoint x="160" y="540"/>
</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="bBdt5q1b351HwNWlHLfP-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-30" target="bBdt5q1b351HwNWlHLfP-1" edge="1">
<mxGeometry relative="1" 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="360" 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="360" 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&lt;br&gt;(default)&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;br&gt;(by tag)&lt;br&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="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;&lt;br style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;(by tag)&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="430" 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&lt;br&gt;(&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;default&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&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="329.53" y="430" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-44" value="&lt;b&gt;BitBucket &amp;gt;=6.0&lt;/b&gt;&lt;br style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;(by tag)&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="510" 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;" parent="1" vertex="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:php&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="510" 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;" parent="1" vertex="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;" parent="1" vertex="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;" parent="1" vertex="1">
<mxGeometry x="9.53" y="280" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-16" value="" style="group" parent="1" vertex="1" connectable="0">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<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;" parent="661J1RdMhrbpdGnhcWUA-16" vertex="1">
<mxGeometry x="609.53" y="30" width="110" height="30" as="geometry"/>
</mxCell>
<mxCell id="BSTWsPW5K0Pz7Seea1G_-1" value="&lt;b&gt;BitBucket&lt;br&gt;(&lt;/b&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;default&lt;/span&gt;&lt;b&gt;)&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="329.53" y="510" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="bBdt5q1b351HwNWlHLfP-1" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;websites:php7.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="509.53" y="450" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="wDtG2ugJA-Ccp97bahZy-5" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="wDtG2ugJA-Ccp97bahZy-4" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="779.53" y="300"/>
<mxPoint x="1024.53" y="300"/>
</Array>
<mxPoint x="780" y="300" as="sourcePoint"/>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-31" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="660" y="360" as="targetPoint"/>
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="640" y="340"/>
<mxPoint x="640" y="390"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-20" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="640" y="340"/>
<mxPoint x="640" y="460"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-3" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="640" y="340"/>
<mxPoint x="640" y="630"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-3" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
<mxGeometry x="649.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-4" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&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=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
<mxGeometry x="959.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-5" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&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=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
<mxGeometry x="809.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 41 KiB

4
.github/docker-scripts.svg vendored Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,123 @@
name: EpicMorg Debian Wrb Images
on:
# push:
# branches:
# - 'master'
schedule:
- cron: '2 2 * * 1,3,5'
jobs:
build-php-images:
name: Build EpicMorg PHP Images
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: "Build and Deploy PHP Latest Image:"
run: cd /linux/ecosystem/php/latest && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.2 Image:"
run: cd /linux/ecosystem/php/7.2 && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.3 Image:"
run: cd /linux/ecosystem/php/7.3 && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.4 Image:"
run: cd /linux/ecosystem/php/7.4 && pwd && make build && make deploy
- name: "Build and Deploy PHP 8.0 Image:"
run: cd /linux/ecosystem/php/8.0 && pwd && make build && make deploy
##################################################################################
build-apache2-images:
name: Build EpicMorg Apache 2 Images
runs-on: ubuntu-22.04
needs: build-php-images
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: "Build and Deploy Apache 2 Latest Image:"
run: cd /linux/ecosystem/apache2/latest && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.2 Image:"
run: cd /linux/ecosystem/apache2/7.2 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.3 Image:"
run: cd /linux/ecosystem/apache2/7.3 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.4 Image:"
run: cd /linux/ecosystem/apache2/7.4 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 8.0 Image:"
run: cd /linux/ecosystem/apache2/8.0 && pwd && make build && make deploy
##################################################################################
build-nginx-images:
name: Build EpicMorg NginX Images
runs-on: ubuntu-22.04
needs: build-php-images
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: "Build and Deploy NginX Image:"
run: cd linux/ecosystem/nginx/latest/main && pwd && make build && make deploy
- name: "Build and Deploy NginX + PHP Image:"
run: cd linux/ecosystem/nginx/latest/php && pwd && make build && make deploy
- name: "Build and Deploy NginX + RTMP-HLS Image:"
run: cd linux/ecosystem/nginx/latest/rtmp-hls && pwd && make build && make deploy
##################################################################################
build-testrail-images:
name: Build EpicMorg Testrail Images
runs-on: ubuntu-22.04
needs: build-php-images
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: "Build and Deploy Cassandra 3.11 Image:"
run: cd /linux/ecosystem/cassandra/3.11 && pwd && make build && make deploy
- name: "Build and Deploy Testrail Image:"
run: cd /linux/ecosystem/testrail/latest && pwd && make build && make deploy
- name: "Build and Deploy Testrail + AD Image:"
run: cd /linux/ecosystem/testrail/ad && pwd && make build && make deploy
- name: "Build and Deploy Testrail + LDAP Image:"
run: cd /linux/ecosystem/testrail/ldap && pwd && make build && make deploy
##################################################################################
- name: Cleanup
run: make docker-clean

View File

@ -5,7 +5,7 @@ on:
# branches: # branches:
# - 'develop' # - 'develop'
schedule: schedule:
- cron: '0 0 * * *' # At the end of every day - cron: '0 0 * * 2,4,6'
jobs: jobs:
@ -21,12 +21,145 @@ jobs:
- name: Test Make - name: Test Make
run: make run: make
##################################################################################
- name: Build and Deploy TorrServer - name: Build and Deploy TorrServer
run: cd linux/ecosystem/torrserver && make build && make deploy run: cd linux/ecosystem/torrserver && make build && make deploy
################################################################################## ##################################################################################
build-ers-image:
name: EpicMorg EcoSystem Electron Release Server Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy Electron Release Server
run: cd llinux/ecosystem/electron-release-server && make build && make deploy
##################################################################################
build-vk2discord-image:
name: EpicMorg EcoSystem vk2discord Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy vk2discord
run: cd llinux/ecosystem/vk2discord && make build && make deploy
##################################################################################
build-qbittorrent-image:
name: EpicMorg EcoSystem qBittorrent Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy qBittorrent
run: cd llinux/ecosystem/qbittorrent && make build && make deploy
##################################################################################
build-opentracker-image:
name: EpicMorg EcoSystem openTracker Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy openTracker
run: cd llinux/ecosystem/opentracker && make build && make deploy
##################################################################################
build-retracker-image:
name: EpicMorg EcoSystem reTracker Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy reTracker
run: cd llinux/ecosystem/retracker && make build && make deploy
##################################################################################
build-torrust-tracker-image:
name: EpicMorg EcoSystem Torrust Tracker Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy Torrust Tracker
run: cd llinux/ecosystem/torrust-tracker && make build && make deploy
##################################################################################
build-monero-cli-image:
name: EpicMorg EcoSystem Monero CLI Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy Monero CLI
run: cd llinux/ecosystem/monero/monerod && make build && make deploy
##################################################################################
build-monero-p2pool-image:
name: EpicMorg EcoSystem Monero p2pool Image
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Log into registry
run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
- name: Test Make
run: make
- name: Build and Deploy Monero p2pool
run: cd llinux/ecosystem/monero/p2pool && make build && make deploy
##################################################################################
- name: Cleanup - name: Cleanup
run: make docker-clean run: make docker-clean