Add experimental host-runner shims for well known-binaries

Loosely based off containers/toolbox#145 Doesn't work with sudo and hard coded shims in the docker container. Pending better UIX with containers/toolbox#553 Signed-off-by: anthr76 <[email protected]>
anthr76 · Mar 17, 2021 · 3fac8b0 · 3fac8b0
1 parent 189ec63
commit 3fac8b0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/images/shim/00-shim.sh b/images/shim/00-shim.sh
@@ -6,6 +6,8 @@ echo ""
 echo "Starting ansible-pull provision..."
 echo "manually run with provision"
 
+export PATH="/usr/libexec/toolbox:$PATH"
+
 sleep 1
 
 nohup ansible-pull -U https://github.com/anthr76/tooling.git -i "$(uname -n)," --diff -e playbook_dir shim/local.yml &>/tmp/last-ansible-pull &

diff --git a/images/shim/Dockerfile b/images/shim/Dockerfile
@@ -16,4 +16,19 @@ RUN dnf clean all
 
 COPY 00-shim.sh /etc/profile.d/00-shim.sh
 
+RUN mkdir /usr/libexec/toolbox
+COPY host-runner /usr/libexec/toolbox/host-runner
+
+RUN ls /usr/libexec/toolbox \
+&& \
+chmod +x /usr/libexec/toolbox/host-runner \
+&& \
+ln -s /usr/libexec/toolbox/host-runner /usr/libexec/flatpak \
+&& \
+ln -s /usr/libexec/toolbox/host-runner /usr/libexec/virsh \
+&& \
+ln -s /usr/libexec/toolbox/host-runner /usr/libexec/podman \
+&& \
+ln -s /usr/libexec/toolbox/host-runner /usr/libexec/virt-install
+
 CMD /bin/sh
diff --git a/images/shim/host-runner b/images/shim/host-runner
@@ -0,0 +1,5 @@
+#!/bin/bash 
+# https://github.com/containers/toolbox/issues/145
+executable=$(basename $0)
+set -x
+exec flatpak-spawn --host --watch-bus --forward-fd=1 --forward-fd=2 --directory=$(pwd) --env=TERM=xterm-256color $executable "$@"
diff --git a/shim/tasks/packages.yml b/shim/tasks/packages.yml
@@ -5,13 +5,20 @@
     name: "*"
     state: latest
 
-- name: 'install OBS repo'
+- name: 'install OBS k8s repo'
   command:
     cmd: dnf config-manager --add-repo https://download.opensuse.org/repositories/home:anthr76:kubernetes/openSUSE_Tumbleweed/home:anthr76:kubernetes.repo
     warn: false
   args:
     creates: /etc/dnf/repos.d/home:anthr76:kubernetes.repo
 
+- name: 'install OBS repo'
+  command:
+    cmd: dnf config-manager --add-repo https://download.opensuse.org/repositories/home:anthr76/openSUSE_Tumbleweed/home:anthr76.repo
+    warn: false
+  args:
+    creates: /etc/dnf/repos.d/home:anthr76.repo
+
 - name: 'install packages'
   dnf:
     name:
@@ -27,3 +34,5 @@
       - go
       - python38-pre-commit
       - gh
+      - flatpak-xdg-utils
+