更新WeChat至4.0.0.30版本

CHANGELOG/CHANGELOG-4.0.0.30-tint2.md → CHANGELOG/CHANGELOG-4.0.0.30.md

@@ -1,13 +1,16 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
-- [v4.0.0.30-tint2](#v4.0.0.30-tint2)
+- [v4.0.0.30](#v4.0.0.30)
   - [Changelog since v1.0.0.0](#changelog-since-v1.0.0.0)
     - [Other notable changes](#other-notable-changes)
 <!-- END MUNGE: GENERATED_TOC -->
 
 <!-- NEW RELEASE NOTES ENTRY -->
 
+# v4.0.0.30
+## Version
+- v4.0.0.30
+- v4.0.0.30-tint2
 
-# v4.0.0.30-tint2
 ## Changelog since v1.0.0.0
 ### Other notable changes
 - Wechat版本更新为4.0.0.30

CHANGELOG/README.md

@@ -1,3 +1,3 @@
 # CHANGELOGs
 
-- [CHANGELOG-4.0.0.30-tint2.md](./CHANGELOG-4.0.0.30-tint2.md)
+- [CHANGELOG-4.0.0.30.md](./CHANGELOG-4.0.0.30.md)

Dockerfile

@@ -16,10 +16,6 @@ RUN \
     https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.deb && \
   echo "**** install packages ****" && \
   apt-get update && \
-  apt-get install --no-install-recommends -y \
-    libqt5gui5 \
-    thunar \
-    tint2 && \
   apt-get install -y --no-install-recommends \
     libatomic1 \
     libxkbcommon-x11-dev \
@@ -30,16 +26,10 @@ RUN \
   apt-get install -y --no-install-recommends \
     /tmp/WeChatLinux_x86_64.deb
 RUN \
-  apt-get install -y \
-    fonts-noto-cjk \
-    im-config \
-    zenity \
+  echo "**** add fcitx5 ****" && \
+  apt-get install -y --no-install-recommends \
     fcitx5 \
     fcitx5-chinese-addons && \
-  echo "**** openbox tweaks ****" && \
-  sed -i \
-    's/NLMC/NLIMC/g' \
-    /etc/xdg/openbox/rc.xml && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \

README.md

@@ -42,7 +42,7 @@
 ```yaml
 services:
   wechat:
-    image: sassv/wechat:tint2-4.0.0.30
+    image: sassv/wechat:latest
     container_name: wechat
     security_opt:
       - seccomp:unconfined #optional
@@ -80,7 +80,7 @@ docker run -d \
   --device /dev/dri:/dev/dri \
   --shm-size="4gb" \
   --restart unless-stopped \
-  sassv/wechat:tint2-4.0.0.30
+  sassv/wechat:latest
 ```
 ## 参数
 容器是通过在运行时传递的参数（如上述所示）进行配置的。这些参数用冒号分隔，并分别表示`< external >:< internal >`。例如，`-p 8080:80` 将使容器内的80端口可以从容器外部的主机 IP 的8080端口上进行访问。

root/defaults/autostart

@@ -1,9 +1,4 @@
-# default file copies first run
-if [ ! -f $HOME/.config/tint2/tint2rc ]; then
-    mkdir -p $HOME/.config/tint2
-    cp /defaults/tint2rc $HOME/.config/tint2/tint2rc
-fi
-
+#!/bin/bash
 # set fcitx5 config
 if [ ! -f $HOME/.config/fcitx5/config ];then
     mkdir -p $HOME/.config/fcitx5
@@ -114,7 +109,6 @@ if [ ! -f $HOME/.config/fcitx5/profile ];then
 	EOF
 fi
 
-# Start UI
-tint2 &
+# Start
 fcitx5 &
-wechat
+wrapped-wechat ${WECHAT_CLI}

root/defaults/menu.xml

@@ -3,5 +3,6 @@
 <menu id="root-menu" label="MENU">
 <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm"><action name="Execute"><command>/usr/bin/xterm</command></action></item>
 <item label="fcitx5" icon="/usr/share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.png"><action name="Execute"><command>/usr/bin/fcitx5</command></action></item>
+<item label="wechat" icon="/usr/share/icons/hicolor/48x48/apps/wechat.png"><action name="Execute"><command>/usr/bin/wrapped-wechat</command></action></item>
 </menu>
 </openbox_menu>

root/usr/bin/wrapped-wechat

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+BIN=/usr/bin/wechat
+
+# Cleanup
+if ! pgrep wechat > /dev/null;then
+  rm -f $HOME/.config/wechat/Singleton*
+fi
+
+# Run normally on privved containers or modified un non priv
+if grep -q 'Seccomp:.0' /proc/1/status; then
+  ${BIN} \
+   "$@" > /dev/null 2>&1
+fi