From 42af7fdbae5657a188d6d1a2a1ebb78d82e6d146 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Mon, 24 Jun 2024 09:24:38 +0000 Subject: [PATCH 1/2] add containerless support --- src/scripts/claimed | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/scripts/claimed b/src/scripts/claimed index 15b97b3..6cff5ae 100755 --- a/src/scripts/claimed +++ b/src/scripts/claimed @@ -29,7 +29,6 @@ fi envs="" if [[ $1 == "--component" ]]; then - echo "Assuming arguments in format '--argument_name argument_value'" image=$2 shift 2 for var in "$@"; do @@ -40,32 +39,34 @@ if [[ $1 == "--component" ]]; then fi done else - echo "Assuming arguments contain = sign (deprecated)" - image=$1 - envs="" - shift - for var in "$@" - do - envs="${envs} --env ${var}" - done + echo "Assuming arguments contain = sign, you need to provide the --component to run, aborting" + exit 1 fi if [[ "$image" != */* ]]; then - image=romeokienzler/$image + image=docker.io/claimed/$image fi if [[ "$image" != *:* ]]; then - docker pull $image:latest image=$image:latest fi - -if [ -z ${CLAIMED_DATA_PATH+x} ]; then - echo "CLAIMED_DATA_PATH variable not set, not mounting /data to the CLAIMED component" - docker run $envs $image +if [[ "$image" != *containerless* ]]; then + if [ -z ${CLAIMED_DATA_PATH+x} ]; then + echo "CLAIMED_DATA_PATH variable not set, not mounting /data to the CLAIMED component" + docker run $envs $image + else + echo "CLAIMED_DATA_PATH variable is set, mounting $CLAIMED_DATA_PATH to /opt/app-root/src/data" + docker run $envs -u 0 -v `echo $CLAIMED_DATA_PATH`:/opt/app-root/src/data:z $image + fi else - echo "CLAIMED_DATA_PATH variable is set, mounting $CLAIMED_DATA_PATH to /opt/app-root/src/data" - docker run $envs -u 0 -v `echo $CLAIMED_DATA_PATH`:/opt/app-root/src/data:z $image + echo "Entering containerless operation" + if [ -z ${CLAIMED_CONTAINERLESS_OPERATOR_PATH+x} ]; then + echo "CLAIMED_CONTAINERLESS_OPERATOR_PATH not set, aborting" + exit 1 + else + + fi fi From 1bb9a8144daf9098850b09dbcd9c03f63ee90b2e Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 26 Jun 2024 16:44:24 +0200 Subject: [PATCH 2/2] add cli support for running containerless components --- src/scripts/claimed | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/scripts/claimed b/src/scripts/claimed index 6cff5ae..1aefe32 100755 --- a/src/scripts/claimed +++ b/src/scripts/claimed @@ -67,6 +67,13 @@ else echo "CLAIMED_CONTAINERLESS_OPERATOR_PATH not set, aborting" exit 1 else - + containerlesscomponentpath=`sed "s/containerless//g" <<< "$image"` + containerlesscomponentpath=`sed "s/:/./g" <<< "$containerlesscomponentpath"` + containerlesscomponent=$containerlesscomponentpath"/runnable.py" + command="python "$CLAIMED_CONTAINERLESS_OPERATOR_PATH"/"$containerlesscomponent" "$envs + echo "Executing: "$command + source $CLAIMED_CONTAINERLESS_OPERATOR_PATH'/'$containerlesscomponentpath"/claimedenv/bin/activate" + chmod 755 $CLAIMED_CONTAINERLESS_OPERATOR_PATH"/"$containerlesscomponent + $command fi fi