--podman: experimental option to use podman instead of docker #255

mviereck · Jun 7, 2020 · f1838f3 · f1838f3
1 parent 347adce
commit f1838f3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/x11docker b/x11docker
@@ -6279,6 +6279,7 @@ check_host() {                  # check host environment
       Dockerexe="docker"
     ;;
   esac
+  [ "$Podman" = "yes" ] && Dockerexe="podman"
 
   # Check host IP. Needed for --pulseaudio=tcp, --printer=tcp, --xoverip and --xwin
   case $Winsubsystem in
@@ -8022,6 +8023,7 @@ declare_variables() {           # declare global variables
   Interactive="no"                                # --interactive: Run docker with interactive tty yes/no
   Limitresources=""                               # --limit: Limit access to CPU and RAM, 0.1 ... 1.0
   Noentrypoint="no"                               # --no-entrypoint: Disable entrypoint in image yes/no
+  Podman="no"                                     # --podman: Use podman instead of docker
   Runtime=""                                      # Runtime to use. runc|nvidia|kata-runtime|crun
   Sharehostipc="no"                               # --hostipc: Set --ipc=host.
   Sharehostnet="no"                               # --hostnet: Set --network=host
@@ -8180,7 +8182,7 @@ parse_options() {               # parse cli options
   Longoptions="$Longoptions,cleanup,help,launcher,licence,license,version,wmlist"                                          # Special options without starting X or container
   Longoptions="$Longoptions,install,remove,update,update-master"                                                           # Installation
   #
-  Longoptions="$Longoptions,iglx,keepcache,no-setup,xcomposite,xorgconf:,runx"                                             # Experimental
+  Longoptions="$Longoptions,iglx,keepcache,no-setup,podman,xcomposite,xorgconf:,runx"                                      # Experimental
   Longoptions="$Longoptions,dbus-system,homedir:,no-xhost,sharedir:,sharessh,systemd"                                      # Deprecated
   Longoptions="$Longoptions,cachedir:,no-init,nothing,no-xtest,openrc,ps,runit,silent,starter,stderr,stdout"               # Removed
   Longoptions="$Longoptions,sys-admin,sysvinit,tini,trusted,untrusted,vcxsrv"                                              # Removed
@@ -8404,6 +8406,7 @@ ${2:-}"                       ; shift ;;                             # Add custo
          --iglx)              Iglx="yes" ;               note "Option --iglx: experimental only." ;;            # Indirect rendering; broken since Xorg ~18.2
          --keepcache)         Preservecachefiles="yes" ; note "Option --keepcache: experimental only." ;;            
          --no-setup)          Containersetup="no" ;      note "Option --no-setup: experimental only." ;;            
+         --podman)            Podman="yes" ;             note "Option --podman: experimental only." ;;            
          --xcomposite)        Xcomposite="yes" ;         note "Option --xcomposite: experimental only." ;;      # Enable X extension COMPOSITE
          --xorgconf)          Xorgconf="${2:-}" ;        note "Option --xorgconf: eperimental only" ; shift ;;  # Custom xorg.conf