extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-25 00:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-6116_network_sidecar_logging' into 'develop'

Browse Source 
KASM-6116/KASM-6110 Egress logging and notifications improvements

Closes KASM-6116

See merge request kasm-technologies/internal/workspaces-core-images!209
This commit is contained in:
Justin Travis 2024-07-03 22:36:43 +00:00
commit e458919227
10 changed files with 186 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockerfile-kasm-core
View File

@ -56,6 +56,9 @@ ADD /src/common/resources/images/$BG_IMG /usr/share/backgrounds/bg_default.png
ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_ubuntu.png
ADD /src/common/resources/images/icon_ubuntu.png /usr/share/extra/icons/icon_default.png
ADD /src/common/resources/images/icon_kasm.png /usr/share/extra/icons/icon_kasm.png
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Install kasm_vnc dependencies and binaries
COPY ./src/ubuntu/install/kasm_vnc $INST_SCRIPTS/kasm_vnc/

6
dockerfile-kasm-core-alpine
View File

@ -131,6 +131,12 @@ RUN bash $INST_SCRIPTS/extra/$EXTRA_SH && rm -rf $INST_SCRIPTS/extra/
COPY ./src/ubuntu/install/emblems $INST_SCRIPTS/emblems/
RUN bash $INST_SCRIPTS/emblems/install_emblems.sh && rm -rf $INST_SCRIPTS/emblems/
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Create user and home directory for base images that don't already define it
RUN (groupadd -g 1000 kasm-user \
&& useradd -M -u 1000 -g 1000 kasm-user \

6
dockerfile-kasm-core-centos
View File

@ -132,6 +132,12 @@ RUN bash $INST_SCRIPTS/extra/$EXTRA_SH && rm -rf $INST_SCRIPTS/extra/
COPY ./src/ubuntu/install/emblems $INST_SCRIPTS/emblems/
RUN bash $INST_SCRIPTS/emblems/install_emblems.sh && rm -rf $INST_SCRIPTS/emblems/
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Create user and home directory for base images that don't already define it
RUN (groupadd -g 1000 kasm-user \
&& useradd -M -u 1000 -g 1000 kasm-user \

6
dockerfile-kasm-core-fedora
View File

@ -140,6 +140,12 @@ RUN bash $INST_SCRIPTS/extra/$EXTRA_SH && rm -rf $INST_SCRIPTS/extra/
COPY ./src/ubuntu/install/emblems $INST_SCRIPTS/emblems/
RUN bash $INST_SCRIPTS/emblems/install_emblems.sh && rm -rf $INST_SCRIPTS/emblems/
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Create user and home directory for base images that don't already define it
RUN (groupadd -g 1000 kasm-user \
&& useradd -M -u 1000 -g 1000 kasm-user \

6
dockerfile-kasm-core-kasmos
View File

@ -122,6 +122,12 @@ RUN /tmp/theme-src/install-theme
COPY ./kasm-desktop-kde/kde-config/.config $HOME/.config
COPY ./kasm-desktop-kde/kde-config/.local/share/plasma $HOME/.local/share/plasma
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
## Base Apps
COPY ./src/kasmos/install/baseapps/ $INST_SCRIPTS/baseapps/
RUN bash $INST_SCRIPTS/baseapps/install_baseapps.sh \

6
dockerfile-kasm-core-oracle
View File

@ -159,6 +159,12 @@ RUN bash $INST_SCRIPTS/sysbox/install_systemd.sh && rm -rf $INST_SCRIPTS/sysbox/
COPY ./src/ubuntu/install/emblems $INST_SCRIPTS/emblems/
RUN bash $INST_SCRIPTS/emblems/install_emblems.sh && rm -rf $INST_SCRIPTS/emblems/
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Create user and home directory for base images that don't already define it
RUN (groupadd -g 1000 kasm-user \
&& useradd -M -u 1000 -g 1000 kasm-user \

6
dockerfile-kasm-core-suse
View File

@ -134,6 +134,12 @@ RUN bash $INST_SCRIPTS/sysbox/install_systemd.sh && rm -rf $INST_SCRIPTS/sysbox/
COPY ./src/ubuntu/install/emblems $INST_SCRIPTS/emblems/
RUN bash $INST_SCRIPTS/emblems/install_emblems.sh && rm -rf $INST_SCRIPTS/emblems/
### Egress Icons
RUN mkdir -p /usr/share/extra/icons/
ADD /src/common/resources/images/egress_info.svg /usr/share/extra/icons/egress_info.svg
ADD /src/common/resources/images/egress_error.svg /usr/share/extra/icons/egress_error.svg
ADD /src/common/resources/images/egress_offline.svg /usr/share/extra/icons/egress_offline.svg
### Create user and home directory for base images that don't already define it
RUN (groupadd -g 1000 kasm-user \
&& useradd -M -u 1000 -g 1000 kasm-user \

45
src/common/resources/images/egress_error.svg Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="22"
height="22"
id="svg3883">
<defs
id="defs3885" />
<metadata
id="metadata3888">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(0,-26)"
id="layer1">
<path
d="M 10.91791,44.854 1.85,35.815573 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3 z"
id="path3683-6-6"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="M 10.91791,43.854478 1.85,34.816051 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3 z"
id="path3683-6"
style="fill:none;stroke:#df382c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
d="m 10.96875,6.28125 c -2.9839462,0 -5.1261975,0.795122 -6.53125,1.5625 C 3.4355757,8.390957 3.2616143,8.6543666 3,8.90625 l 7.90625,7.875 L 19,8.875 C 18.727116,8.619834 18.54237,8.3889173 17.53125,7.84375 16.104643,7.0745639 13.936715,6.28125 10.96875,6.28125 z"
transform="translate(0,26)"
id="path3868"
style="opacity:0.3;fill:none;stroke:#df382c;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

35
src/common/resources/images/egress_info.svg Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg id="svg3229" width="22" height="22" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<metadata id="metadata9">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<path id="path3683-5" d="m1.85 10.144s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3" style="fill:none;opacity:.3;stroke-linecap:round;stroke-width:1.7;stroke:#000"/>
<path id="path3683" d="m1.85 9.1444s2.8978-3.2944 9.132-3.2944c6.2036 0 9.168 3.3 9.168 3.3" style="fill:none;stroke-linecap:round;stroke-width:1.7;stroke:#dfdbd2"/>
<path id="path3681-0" d="m4.35 12.753s2.1469-2.2158 6.65-2.1369c4.5405 0.07949 6.65 2.1725 6.65 2.1725" style="fill:none;opacity:.3;stroke-linecap:round;stroke-width:1.7;stroke:#000"/>
<path id="path3681" d="m4.35 11.753s2.1469-2.2158 6.65-2.1369c4.5405 0.07949 6.65 2.1725 6.65 2.1725" style="fill:none;stroke-linecap:round;stroke-width:1.7;stroke:#dfdbd2"/>
<path id="path3209-5" d="m7.35 15.191s0.9669-1.072 3.5987-1.0922c2.599-0.01997 3.7013 1.0922 3.7013 1.0922" style="fill:none;opacity:.3;stroke-linecap:round;stroke-width:1.7;stroke:#000"/>
<path id="path3209" d="m7.35 14.191s0.9669-1.072 3.5987-1.0922c2.599-0.01997 3.7013 1.0922 3.7013 1.0922" style="fill:none;stroke-linecap:round;stroke-width:1.7;stroke:#dfdbd2"/>
<path id="path3196-5-7" d="m10.145 17c-0.4719 0-0.8549 0.29867-0.8549 0.66667 0 0.13676 0.0529 0.26394 0.14359 0.36978l1.0076 0.80144c0.14986 0.101 0.34514 0.16212 0.5586 0.16212 0.2533 0 0.48099-0.08605 0.63758-0.22269l0.90091-0.7104c0.10754-0.11149 0.1713-0.25009 0.1713-0.40024 0-0.368-0.38299-0.66667-0.8549-0.66667h-1.7098z" style="fill-rule:evenodd;opacity:.3"/>
<path id="path3196-5" d="m10.145 16c-0.4719 0-0.8549 0.29867-0.8549 0.66667 0 0.13676 0.0529 0.26394 0.14359 0.36978l1.0076 0.80144c0.14986 0.101 0.34514 0.16212 0.5586 0.16212 0.2533 0 0.48099-0.08605 0.63758-0.22269l0.90091-0.7104c0.10754-0.11149 0.1713-0.25009 0.1713-0.40024 0-0.368-0.38299-0.66667-0.8549-0.66667h-1.7098z" style="fill-rule:evenodd;fill:#dfdbd2"/>
<!-- imported from 'ubuntu-mono-dark/status/22/nm-vpn-lock.svg' -->
<g id="svg3215">
<metadata id="metadata12">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<path id="path2441" d="m19 14c-1.108 0-2 0.91076-2 2.0312v0.96875c-0.554 0-1 0.446-1 1v3c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-3c0-0.554-0.446-1-1-1v-0.96875c0-1.1205-0.892-2.0312-2-2.0312zm0 1c0.554 0 1 0.44236 1 1v1h-2v-1c0-0.55764 0.446-1 1-1z" style="opacity:.3"/>
<path id="rect2822" d="m19 13c-1.108 0-2 0.91076-2 2.0312v0.96875c-0.554 0-1 0.446-1 1v3c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1v-3c0-0.554-0.446-1-1-1v-0.96875c0-1.1205-0.892-2.0312-2-2.0312zm0 1c0.554 0 1 0.44236 1 1v1h-2v-1c0-0.55764 0.446-1 1-1z" style="fill:#dfdbd2"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

67
src/common/resources/images/egress_offline.svg Normal file
View File

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
width="22"
height="22"
id="svg3883"
inkscape:version="0.48.0 r9654"
sodipodi:docname="network-offline.svg">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="480"
id="namedview9"
showgrid="false"
inkscape:zoom="13.181818"
inkscape:cx="11"
inkscape:cy="11.568966"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg3883" />
<defs
id="defs3885" />
<metadata
id="metadata3888">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<path
inkscape:connector-curvature="0"
style="opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3683-6-6"
d="M 10.91791,18.854 1.85,9.815573 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3 z" />
<path
inkscape:connector-curvature="0"
style="fill:none;stroke:#dfdbd2;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3683-6"
d="M 10.91791,17.854478 1.85,8.816051 c 0,0 2.8977535,-3.294409 9.131958,-3.294409 6.203557,0 9.168042,3.3 9.168042,3.3 z" />
<path
inkscape:connector-curvature="0"
style="opacity:0.29999999999999999;fill:none;stroke:#dfdbd2;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3868"
d="m 10.96875,6.28125 c -2.9839462,0 -5.1261975,0.795122 -6.53125,1.5625 C 3.4355757,8.390957 3.2616143,8.6543666 3,8.90625 l 7.90625,7.875 L 19,8.875 C 18.727116,8.619834 18.54237,8.3889173 17.53125,7.84375 16.104643,7.0745639 13.936715,6.28125 10.96875,6.28125 z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB