From 270be77cc70edc659e31f8b2454bee113a05ace5 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Wed, 18 Oct 2023 18:31:17 -0300 Subject: [PATCH] support building with podman too Change-Id: I83fc89be6ad2411b64a4bf4e2308c048a9ab2ff4 Signed-off-by: Nick Boldt --- typescript-dto/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/typescript-dto/build.sh b/typescript-dto/build.sh index 4f02e3d1a5..4f173128b0 100755 --- a/typescript-dto/build.sh +++ b/typescript-dto/build.sh @@ -15,7 +15,9 @@ set -u rm -f ./index.d.ts set +e -docker run -i --rm -v "$HOME/.m2:/root/.m2" \ +BUILDER=$(command -v podman) +if [ ! -x "$BUILDER" ]; then BUILDER=$(command -v docker); fi +$BUILDER run -i --rm -v "$HOME/.m2:/root/.m2" \ -v "$(pwd)/dto-pom.xml:/usr/src/mymaven/pom.xml" \ -w /usr/src/mymaven docker.io/maven:3.8-jdk-11 \ /bin/bash -c "mvn -q -U -DskipTests=true -Dfindbugs.skip=true -Dskip-validate-sources install \ @@ -31,4 +33,4 @@ fi CHE_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args="\${project.version}" --non-recursive exec:exec -f ../pom.xml) -docker build -t eclipse-che-ts-api --build-arg CHE_VERSION="${CHE_VERSION}" --build-arg NPM_AUTH_TOKEN="${CHE_NPM_AUTH_TOKEN}" . +$BUILDER build -t eclipse-che-ts-api --build-arg CHE_VERSION="${CHE_VERSION}" --build-arg NPM_AUTH_TOKEN="${CHE_NPM_AUTH_TOKEN}" .