Site-run: prefer podman* over docker* binaries (apache#710)

snazy · web-flow · commit 8762aa8593bc · 2025-01-12T12:09:36.000Z
diff --git a/site/bin/_hugo-docker-include.sh b/site/bin/_hugo-docker-include.sh
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-DOCKER="$(which docker > /dev/null && echo docker || echo podman)"
-COMPOSE="$(which docker-compose > /dev/null && echo docker-compose || echo podman-compose)"
+DOCKER="$(which podman > /dev/null && echo podman || echo docker)"
+COMPOSE="$(which podman-compose > /dev/null && echo podman-compose || echo docker-compose)"
 
 # absolute path to the Polaris workspace, for the volume mount
 WORKSPACE="$(pwd)"

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`# under the License.`
`18`	`18`	`#`
`19`	`19`
`20`		`-DOCKER="$(which docker > /dev/null && echo docker \|\| echo podman)"`
`21`		`-COMPOSE="$(which docker-compose > /dev/null && echo docker-compose \|\| echo podman-compose)"`
	`20`	`+DOCKER="$(which podman > /dev/null && echo podman \|\| echo docker)"`
	`21`	`+COMPOSE="$(which podman-compose > /dev/null && echo podman-compose \|\| echo docker-compose)"`
`22`	`22`
`23`	`23`	`# absolute path to the Polaris workspace, for the volume mount`
`24`	`24`	`WORKSPACE="$(pwd)"`