Remove podman

bin/gitnuro

@@ -1,2 +1,5 @@
 #!/bin/sh
-flatpak run com.jetpackduba.Gitnuro
+
+set -e
+cd ~/local
+exec zulu-17-jre/bin/java -jar Gitnuro-linux-1.2.1.jar

bin/x

@@ -18,27 +18,27 @@ if [[ "$1" = "-s" ]]; then
 fi
 
 if [[ "$1" = "-b" ]]; then
-    set -x
+    set -ex
     xset -b
     xset -dpms
     xset s noblank
     xset s off
 
-    # background
-    hsetroot -full /usr/share/awesome/themes/default/background.png &
-
-    # fcitx
-    fcitx -rd && im-config -n fcitx
-
     # start session
     nohup cinnamon-session &>>/tmp/cinnamon-session.log &
 
     # reload awesome
     until [ -n "$(pgrep -f cinnamon-session)" ]; do
         sleep 1
     done
+    awesome-client 'awesome.restart()' || echo
     sleep 1
-    awesome-client 'awesome.restart()'
+
+    # background
+    hsetroot -full /usr/share/awesome/themes/default/background.png
+
+    # fcitx
+    fcitx -rd && im-config -n fcitx
     exit
 fi
 

etc/docker/daemon.json

@@ -0,0 +1,5 @@
+{
+  "registry-mirrors": [
+    "http://docker.registry:3307"
+  ]
+}

install.yml

@@ -141,7 +141,6 @@
       with_items:
         - etc/X11/xorg.conf.d
         - etc/apt/apt.conf.d
-        - etc/containers
         - etc/fonts/conf.d
         - etc/opt/chrome/policies/managed
         - etc/security/limits.d
@@ -153,8 +152,7 @@
       with_items:
         - etc/X11/xorg.conf.d/99-synaptics.conf
         - etc/apt/apt.conf.d/99default
-        - etc/containers/registries.conf
-        - etc/containers/storage.conf
+        - etc/docker/daemon.json
         - etc/fonts/conf.d/99-default.conf
         - etc/opt/chrome/policies/managed/blocklist.json
         - etc/rc.local
@@ -180,12 +178,6 @@
       with_items:
         - "<dir>~/.fonts</dir>"
 
-    - name: update tsocks config
-      lineinfile:
-        dest: /etc/tsocks.conf
-        regexp: '^server\s{0,}='
-        line: "server = 127.0.0.1"
-
     - name: disable NetworkManager dns
       lineinfile:
         dest: /etc/NetworkManager/NetworkManager.conf

roles/mysql/tasks/main.yml

@@ -5,8 +5,7 @@
 
 - name: start mysql
   shell: >-
-    podman run
-    -d --replace
+    docker run -d
     --name mysql
     --restart always
     --network host
@@ -15,4 +14,4 @@
     -v /var/lib/mysql:/var/lib/mysql
     -v {{playbook_dir}}/roles/mysql/files/conf.d:/etc/mysql/conf.d
     -e MYSQL_ALLOW_EMPTY_PASSWORD=yes
-    docker.mirrors.ustc.edu.cn/library/mysql:8.0.22
+    docker.io/library/mysql:8.0.22

roles/phpmyadmin/tasks/main.yml

@@ -1,7 +1,6 @@
 - name: start phpmyadmin
   shell: >-
-    podman run
-    -d --replace
+    docker run -d
     -p 3309:80
     -e PMA_ARBITRARY=1
     --name phpmyadmin

roles/redis/tasks/main.yml

@@ -5,13 +5,12 @@
 
 - name: start redis
   shell: >-
-    podman run
-    -d --replace
+    docker run -d
     --name redis
     --restart always
     --network host
     --log-opt max-file=10
     --log-opt max-size=100m
     -v /var/lib/redis:/data
-    docker.mirrors.ustc.edu.cn/library/redis:6.2.4
+    docker.io/library/redis:6.2.4
     redis-server --appendonly yes