Update workflows

.github/workflows/desktop.yml

@@ -31,6 +31,8 @@ jobs:
       - name: Build app
         run: |
           node release.js
+        env:
+          DOCKER: docker
         working-directory: src/desktop
 
       - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 #pin v4.6.0
@@ -59,6 +61,8 @@ jobs:
       - name: Build app
         run: |
           node release.js
+        env:
+          DOCKER: docker
         working-directory: src/desktop
 
       - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 #pin v4.6.0

src/desktop/docker/build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 VERSION=${1:?Version Required}

src/desktop/docker/deb/build.sh

@@ -1,19 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
+DOCKER_CMD=${DOCKER:-"podman"}
+
 ARCH='x64'
 if [[ $(uname -m) == "aarch64" ]]; then
     ARCH='arm64'
 fi
 
-podman build -t certificate_factory_deb_build:latest .
+${DOCKER_CMD} build -t certificate_factory_deb_build:latest .
 
 rm -rf build_root
 mkdir -p build_root/package
 cp package_deb.js build_root
 cp -r "../../package/Certbox-linux-${ARCH}" build_root/package
 
-podman run --rm --user root -v $(readlink -f build_root):/build_root:z certificate_factory_deb_build:latest
+${DOCKER_CMD} run --rm --user root -v $(readlink -f build_root):/build_root:z certificate_factory_deb_build:latest
 
 cp build_root/package/artifacts/*.deb .
 rm -rf build_root

src/desktop/docker/deb/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 set -x
 

src/desktop/docker/rpm/build.sh

@@ -1,19 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
+DOCKER_CMD=${DOCKER:-"podman"}
+
 ARCH='x64'
 if [[ $(uname -m) == "aarch64" ]]; then
     ARCH='arm64'
 fi
 
-podman build -t certificate_factory_rh_build:latest .
+${DOCKER_CMD} build -t certificate_factory_rh_build:latest .
 
 rm -rf build_root
 mkdir -p build_root/package
 cp package_rpm.js build_root
 cp -r "../../package/Certbox-linux-${ARCH}" build_root/package
 
-podman run --rm --user root -v $(readlink -f build_root):/build_root:z certificate_factory_rh_build:latest
+${DOCKER_CMD} run --rm --user root -v $(readlink -f build_root):/build_root:z certificate_factory_rh_build:latest
 
 cp build_root/package/artifacts/*.rpm .
 rm -rf build_root

src/desktop/docker/rpm/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 set -x