From 1a78189cca6ddb0fd83034b336ddb47cc79c34a1 Mon Sep 17 00:00:00 2001 From: Matthias Gatto Date: Thu, 4 Nov 2021 12:25:04 +0100 Subject: [PATCH] pkg: enable to use sudo with docker/podman Signed-off-by: Matthias Gatto --- pkg/Makefile | 2 +- pkg/configure | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/Makefile b/pkg/Makefile index 9961ced..2e145b8 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -43,7 +43,7 @@ osc-cli-x86_64.zip: osc-cli zip -r osc-cli-x86_64.zip osc-cli osc-cli: - docker run --rm -v ${PWD}/..:/src outscale/wine-pyinstaller:0.0.1 --distpath ./pkg --clean --name osc-cli osc_sdk/sdk.py + $(SUDO) docker run --rm -v ${PWD}/..:/src outscale/wine-pyinstaller:0.0.1 --distpath ./pkg --clean --name osc-cli osc_sdk/sdk.py clean: rm -rvf *AppImage* osc-cli.AppDir osc-cli.zip osc-cli diff --git a/pkg/configure b/pkg/configure index 2800ca6..9112bbd 100755 --- a/pkg/configure +++ b/pkg/configure @@ -6,6 +6,7 @@ PY_MAJ=3 PY_MID=9 ARCH_OLD=2010 ARCH_TARGET=x86_64 +SUDO="" for arg in $@; do if [ "--help" = $arg ]; then @@ -15,6 +16,9 @@ for arg in $@; do echo " --arch_old=2010|2014|1 choose how oldness of linux targets" return 0 fi + if [ "--sudo-docker" = $arg ]; then + SUDO="sudo" + fi if [ "--py3_ver" = $( echo "$arg" | cut -d '=' -f 1) ]; then PY_MID=$( echo $arg | cut -f 2 -d '=' ) echo "PREFIX FOUND IT'S: "$PY_MAJ @@ -36,7 +40,7 @@ echo PY_STR=$PY_STR >> config.mk echo -n PY_MIN= >> config.mk echo $PY_TARGET | cut -d '.' -f 3 | cut -d '-' -f 1 >> config.mk echo PY_TARGET=$PY_TARGET >> config.mk - +echo SUDO=$SUDO >> config.mk echo "config done:" cat config.mk