Fix qemu-guest-agent image for Promox VE

rancher · Jan 21, 2019 · 4db6e41 · 4db6e41
1 parent 0e3bf0f
commit 4db6e41
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/images/10-qemuguestagent/Dockerfile b/images/10-qemuguestagent/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y qemu-guest-agent \
     && apt-get clean \
     && rm -rf /var/lib/apt/*
+ADD run /usr/local/bin/
 
 ENTRYPOINT ["/usr/bin/ros", "entrypoint"]
 

diff --git a/images/10-qemuguestagent/run b/images/10-qemuguestagent/run
@@ -0,0 +1,14 @@
+#!/bin/bash
+for _ in {1..10}; do
+    if [[ -f /run/console-done ]]; then
+        docker_passwd=`system-docker exec console cat /etc/shadow | grep docker | awk -F ":" '{print $2}'`
+        if [[ $docker_passwd == "*" ]]; then
+            system-docker exec console sh -c 'echo "docker:tcuser" | chpasswd' > /dev/null 2>&1
+        fi
+        break
+    else
+        sleep 2
+    fi
+done
+
+qemu-ga
diff --git a/q/qemu-guest-agent.yml b/q/qemu-guest-agent.yml
@@ -1,10 +1,11 @@
 qemu-guest-agent:
-  image: ${REGISTRY_DOMAIN}/rancher/os-qemuguestagent:v2.8.1-1
-  command: qemu-ga
+  image: ${REGISTRY_DOMAIN}/rancher/os-qemuguestagent:v2.8.1-2
+  command: /usr/local/bin/run
   privileged: true
   restart: always
   labels:
     io.rancher.os.scope: system
+    io.rancher.os.after: console
   pid: host
   ipc: host
   net: host