Merge branch '3.2' of github.com:abcdesktopio/oc.user into 3.2

Dockerfile.ubuntu

@@ -4,6 +4,8 @@ ARG BUILDPLATFORM
 ARG TAG=latest
 # Default base image 
 ARG BASE_IMAGE=ubuntu
+# BASE_IMAGE_RELEASE
+ARG BASE_IMAGE_RELEASE=22.04
 
 # ABCDESKTOP_LOCALACCOUNT_DIR arg
 # use in ENV ABCDESKTOP_LOCALACCOUNT_DIR=$ABCDESKTOP_LOCALACCOUNT_DIR
@@ -35,7 +37,7 @@ RUN cd openbox-3.6.1 && debuild -us -uc
 RUN ls *.deb
 
 
-#####
+#
 # install all nodejs modules
 # build nodejs module
 # create /composer/node
@@ -83,12 +85,15 @@ RUN yarn install --production=true && npm i --package-lock-only && npm audit fix
 # yarn install --production[=true|false]
 # yarn will not install any package listed in devDependencies if the NODE_ENV environment variable is set to production. 
 # Use this flag to instruct Yarn to ignore NODE_ENV and take its production-or-not status from this flag instead.
+# RUN git clone https://github.com/abcdesktopio/oc.user.libraries.git /composer/node/common-libraries
 WORKDIR /composer/node/common-libraries
 RUN yarn install --production=true && npm i --package-lock-only && npm audit fix
 
 WORKDIR /composer/node/broadcast-service
 RUN yarn install --production=true && npm i --package-lock-only && npm audit fix
 
+
+# RUN git clone https://github.com/abcdesktopio/run-service.git /composer/node/ocrun
 WORKDIR /composer/node/ocrun
 RUN yarn install --production=true && npm i --package-lock-only && npm audit fix
 
@@ -171,7 +176,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # tigervncserver_1.13.1-1ubuntu1_arm64.deb    
 # but replace by curl command to support dpkg --print-architecture for amd64 and arm64
 RUN apt-get update  && \  
-    tigervncdeburl="https://raw.githubusercontent.com/abcdesktopio/oc.user/main/tigervncserver_1.13.1-1ubuntu1_$(dpkg --print-architecture).deb" && \
+    tigervncdeburl="https://github.com/abcdesktopio/oc.user/raw/3.3/tigervncserver_1.13.1-1ubuntu1_$(dpkg --print-architecture).deb" && \
     echo Downloading $tigervncdeburl && \
     curl -sL --output /tmp/tigervncserver.deb "$tigervncdeburl" && \  
     apt-get install -y --no-install-recommends /tmp/tigervncserver.deb && \
@@ -199,18 +204,10 @@ RUN apt-get update && \
 	adwaita-icon-theme \
 	adwaita-qt \
 	xclip \
-        gsetroot \
+	openbox \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 
-# install openbox custome packages 
-RUN mkdir -p /tmp/packages
-COPY --from=openbox_ubuntu_builder /openbox/libobt* /openbox/openbox_3.6.1* /openbox/libobrender* /tmp/packages/
-RUN apt-get update  && \
-        apt-get install -y --no-install-recommends -f /tmp/packages/*.deb  && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*        
-
 # Uncommant lines to add picom compositor and watermarking support 
 #
 # to add compositor ( this option takes more memory in user's pod )

Makefile

@@ -38,16 +38,6 @@ alpine.hardening:
 
 
 
-ubuntu30:
-	docker pull ubuntu:22.04
-	docker build \
-            --no-cache=$(NOCACHE) \
-            --build-arg TARGET_MODE=kubernetes \
-            --build-arg ABCDESKTOP_LOCALACCOUNT_DIR=/var/secrets/abcdesktop/localaccount \
-            --build-arg BASE_IMAGE_RELEASE=22.04 \
-            --build-arg BASE_IMAGE=ubuntu \
-            --tag abcdesktopio/oc.user.ubuntu:3.0 \
-            --file Dockerfile.ubuntu .
 
 hardening31:
 	docker pull ubuntu:22.04

composer/docker-entrypoint.sh

@@ -135,6 +135,13 @@ if [ ! -d ~/.config/nautilus ]; then
         mkdir -p ~/.config/nautilus
 fi
 
+
+if [ ! -d ~/.config/plank/dock1/launchers ]; then
+        echo "create ~/.config/plank/dock1/launchers directory"
+        mkdir -p ~/.config/plank/dock1/launchers
+fi
+
+
 # if [ ! -d ~/.themes ]; then
 #	echo "create ~/.themes directory"
 #	cp -rp /composer/.themes ~ &

composer/overwrite_environment_variable_for_application.sh

@@ -92,7 +92,12 @@ if [ -d /proc/driver/nvidia ]; then
        if [ -x /usr/bin/nvidia-smi ]; then
                 # command line /usr/bin/nvidia-smi found
                 # nvidia-smi read gpu_uuid
-		gpu_uuid=$(nvidia-smi --query-gpu=gpu_uuid --format=csv,noheader)
+		uuid=$(nvidia-smi -L | grep "UUID: MIG" | grep -oP '(?<=UUID: ).*?(?=\))')
+		if [ -z "$uuid" ]; then
+			gpu_uuid=$(nvidia-smi --query-gpu=gpu_uuid --format=csv,noheader)
+   		else
+     			gpu_uuid=$uuid
+		fi
              	NVIDIA_GPU="{ \"NVIDIA_VISIBLE_DEVICES\" : \"$gpu_uuid\" }"  
         fi
 fi

composer/tigervnc.sh

@@ -44,4 +44,4 @@ echo "XVNC_PARAMS=$XVNC_PARAMS"
 echo "CONTAINER_IP_ADDR=$CONTAINER_IP_ADDR"
 
 # set 3840x2160 
-exec /usr/bin/Xvnc :0 zliblevel=5 -auth ~/.Xauthority -geometry 3840x2160  -SendPrimary=0 -depth 24 -rfbport=-1 -rfbunixpath /tmp/.x11vnc -pn -rfbauth "$ABCDESKTOP_RUN_DIR"/.vnc/passwd ${XVNC_PARAMS} +extension GLX +extension RANDR +extension MIT-SHM
+exec /usr/bin/Xvnc :0 zliblevel=5 -auth ~/.Xauthority -geometry 3840x2160 -SendPrimary=0 -depth 24 -rfbport=-1 -rfbunixpath /tmp/.x11vnc -pn -rfbauth "$ABCDESKTOP_RUN_DIR"/.vnc/passwd ${XVNC_PARAMS} +extension GLX +extension RANDR +extension MIT-SHM

usr/share/plank/themes/TransPanel/dock.theme

@@ -0,0 +1,65 @@
+#This file auto-generated by Plank.
+#2024-05-31T13:39:11+0000
+[PlankTheme]
+#The roundness of the top corners.
+TopRoundness=0
+#The roundness of the bottom corners.
+BottomRoundness=0
+#The thickness (in pixels) of lines drawn.
+LineWidth=0
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=0;;0;;0;;95
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=40;;40;;40;;125
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=30;;30;;30;;175
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=75;;75;;75;;255
+
+[PlankDockTheme]
+#The padding on the left/right dock edges, in tenths of a percent of IconSize.
+HorizPadding=1.5
+#The padding on the top dock edge, in tenths of a percent of IconSize.
+TopPadding=2.5
+#The padding on the bottom dock edge, in tenths of a percent of IconSize.
+BottomPadding=2.5
+#The padding between items on the dock, in tenths of a percent of IconSize.
+ItemPadding=6
+#The size of item indicators, in tenths of a percent of IconSize.
+IndicatorSize=5
+#The size of the icon-shadow behind every item, in tenths of a percent of IconSize.
+IconShadowSize=1
+#The height (in percent of IconSize) to bounce an icon when the application sets urgent.
+UrgentBounceHeight=1.6666666666666667
+#The height (in percent of IconSize) to bounce an icon when launching an application.
+LaunchBounceHeight=0.625
+#The opacity value (0 to 1) to fade the dock to when hiding it.
+FadeOpacity=1
+#The amount of time (in ms) for click animations.
+ClickTime=300
+#The amount of time (in ms) to bounce an urgent icon.
+UrgentBounceTime=600
+#The amount of time (in ms) to bounce an icon when launching an application.
+LaunchBounceTime=600
+#The amount of time (in ms) for active window indicator animations.
+ActiveTime=300
+#The amount of time (in ms) to slide icons into/out of the dock.
+SlideTime=300
+#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
+FadeTime=200
+#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
+HideTime=150
+#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
+GlowSize=30
+#The total time (in ms) to show the hidden-dock urgent glow.
+GlowTime=10000
+#The time (in ms) of each pulse of the hidden-dock urgent glow.
+GlowPulseTime=2000
+#The hue-shift (-180 to 180) of the urgent indicator color.
+UrgentHueShift=150
+#The time (in ms) to move an item to its new position or its addition/removal to/from the dock.
+ItemMoveTime=450
+#Whether background and icons will unhide/hide with different speeds. The top-border of both will leave/hit the screen-edge at the same time.
+CascadeHide=true
+#The color (RGBA) of the badge displaying urgent count
+BadgeColor=0;;0;;0;;0

usr/share/plank/themes/TransPanel/hover.theme

@@ -0,0 +1,65 @@
+#This file auto-generated by Plank.
+#2024-05-31T13:39:11+0000
+[PlankTheme]
+#The roundness of the top corners.
+TopRoundness=0
+#The roundness of the bottom corners.
+BottomRoundness=0
+#The thickness (in pixels) of lines drawn.
+LineWidth=0
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=0;;0;;0;;95
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=40;;40;;40;;125
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=30;;30;;30;;175
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=75;;75;;75;;255
+
+[PlankDockTheme]
+#The padding on the left/right dock edges, in tenths of a percent of IconSize.
+HorizPadding=1.5
+#The padding on the top dock edge, in tenths of a percent of IconSize.
+TopPadding=2.5
+#The padding on the bottom dock edge, in tenths of a percent of IconSize.
+BottomPadding=2.5
+#The padding between items on the dock, in tenths of a percent of IconSize.
+ItemPadding=6
+#The size of item indicators, in tenths of a percent of IconSize.
+IndicatorSize=5
+#The size of the icon-shadow behind every item, in tenths of a percent of IconSize.
+IconShadowSize=1
+#The height (in percent of IconSize) to bounce an icon when the application sets urgent.
+UrgentBounceHeight=1.6666666666666667
+#The height (in percent of IconSize) to bounce an icon when launching an application.
+LaunchBounceHeight=0.625
+#The opacity value (0 to 1) to fade the dock to when hiding it.
+FadeOpacity=1
+#The amount of time (in ms) for click animations.
+ClickTime=300
+#The amount of time (in ms) to bounce an urgent icon.
+UrgentBounceTime=600
+#The amount of time (in ms) to bounce an icon when launching an application.
+LaunchBounceTime=600
+#The amount of time (in ms) for active window indicator animations.
+ActiveTime=300
+#The amount of time (in ms) to slide icons into/out of the dock.
+SlideTime=300
+#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
+FadeTime=200
+#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
+HideTime=150
+#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
+GlowSize=30
+#The total time (in ms) to show the hidden-dock urgent glow.
+GlowTime=10000
+#The time (in ms) of each pulse of the hidden-dock urgent glow.
+GlowPulseTime=2000
+#The hue-shift (-180 to 180) of the urgent indicator color.
+UrgentHueShift=150
+#The time (in ms) to move an item to its new position or its addition/removal to/from the dock.
+ItemMoveTime=450
+#Whether background and icons will unhide/hide with different speeds. The top-border of both will leave/hit the screen-edge at the same time.
+CascadeHide=true
+#The color (RGBA) of the badge displaying urgent count
+BadgeColor=0;;0;;0;;0