From bcfe3fee066e4f4a1380c78f2267e4bc9ed80032 Mon Sep 17 00:00:00 2001 From: Mariusz Marciniak Date: Wed, 3 Jul 2024 22:36:43 +0000 Subject: [PATCH] KASM-6116/KASM-6110 Egress logging and notifications improvements --- dockerfile-kasm-core | 3 + dockerfile-kasm-core-alpine | 6 ++ dockerfile-kasm-core-centos | 6 ++ dockerfile-kasm-core-fedora | 6 ++ dockerfile-kasm-core-kasmos | 6 ++ dockerfile-kasm-core-oracle | 6 ++ dockerfile-kasm-core-suse | 6 ++ src/common/resources/images/egress_error.svg | 45 +++++++++++++ src/common/resources/images/egress_info.svg | 35 ++++++++++ .../resources/images/egress_offline.svg | 67 +++++++++++++++++++ 10 files changed, 186 insertions(+) create mode 100644 src/common/resources/images/egress_error.svg create mode 100644 src/common/resources/images/egress_info.svg create mode 100644 src/common/resources/images/egress_offline.svg diff --git a/dockerfile-kasm-core b/dockerfile-kasm-core index 1d30b0b..3f60cec 100644 --- a/dockerfile-kasm-core +++ b/dockerfile-kasm-core @@ -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/ diff --git a/dockerfile-kasm-core-alpine b/dockerfile-kasm-core-alpine index 01514eb..25ef664 100644 --- a/dockerfile-kasm-core-alpine +++ b/dockerfile-kasm-core-alpine @@ -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 \ diff --git a/dockerfile-kasm-core-centos b/dockerfile-kasm-core-centos index 64d5544..57b0f0d 100644 --- a/dockerfile-kasm-core-centos +++ b/dockerfile-kasm-core-centos @@ -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 \ diff --git a/dockerfile-kasm-core-fedora b/dockerfile-kasm-core-fedora index 0e3d21b..e886803 100644 --- a/dockerfile-kasm-core-fedora +++ b/dockerfile-kasm-core-fedora @@ -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 \ diff --git a/dockerfile-kasm-core-kasmos b/dockerfile-kasm-core-kasmos index 5ca5b60..6f81f85 100644 --- a/dockerfile-kasm-core-kasmos +++ b/dockerfile-kasm-core-kasmos @@ -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 \ diff --git a/dockerfile-kasm-core-oracle b/dockerfile-kasm-core-oracle index 3718606..42f1a8e 100644 --- a/dockerfile-kasm-core-oracle +++ b/dockerfile-kasm-core-oracle @@ -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 \ diff --git a/dockerfile-kasm-core-suse b/dockerfile-kasm-core-suse index 2d1490f..c064148 100644 --- a/dockerfile-kasm-core-suse +++ b/dockerfile-kasm-core-suse @@ -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 \ diff --git a/src/common/resources/images/egress_error.svg b/src/common/resources/images/egress_error.svg new file mode 100644 index 0000000..d7d0bc9 --- /dev/null +++ b/src/common/resources/images/egress_error.svg @@ -0,0 +1,45 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/common/resources/images/egress_info.svg b/src/common/resources/images/egress_info.svg new file mode 100644 index 0000000..d785983 --- /dev/null +++ b/src/common/resources/images/egress_info.svg @@ -0,0 +1,35 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/common/resources/images/egress_offline.svg b/src/common/resources/images/egress_offline.svg new file mode 100644 index 0000000..3ad171c --- /dev/null +++ b/src/common/resources/images/egress_offline.svg @@ -0,0 +1,67 @@ + + + + + + + + + + image/svg+xml + + + + + + + + +