fix: run docker/podman container once

Instead of running multiple containers, it is enough to use just one.

Signed-off-by: Evgeny Semenov <[email protected]>

Author: qwersem

bin/setup

@@ -9,6 +9,15 @@ CONTAINER_TAG=`cat ${ROOT}/bin/.container-tag`
 # Parse command line arguments
 PRESERVE_CONFIG=0
 
+CONTAINER_SETUP_CMD=()
+run() {
+  if [ "${CONTAINER_TYPE}" == "docker" -o "${CONTAINER_TYPE}" == "podman" ]; then
+    CONTAINER_SETUP_CMD+=( "$*" )
+  else
+    ${RUN} "$@"
+  fi
+}
+
 # Only parse arguments if this script is being run directly (not sourced)
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   for arg in "$@"; do
@@ -159,10 +168,8 @@ if [ -f $ROOT/.git ]; then
     HOME_OPT="${HOME_OPT} --bind ${GIT_PATH}:${GIT_PATH}"
 fi
 
-if [ "${CONTAINER_TYPE}" == "devcontainer" ]; then
+if [ "${CONTAINER_TYPE}" == "devcontainer" -o "${CONTAINER_TYPE}" == "docker" -o "${CONTAINER_TYPE}" == "podman" ]; then
     RUN=""
-elif [ "${CONTAINER_TYPE}" == "docker" -o "${CONTAINER_TYPE}" == "podman" ]; then
-    RUN="${CONTAINER_BASE}"
 elif [ "${CONTAINER_TYPE}" == "singularity" ]; then
     RUN="singularity run ${HOME_OPT} ${CONTAINER_PATH}"
 else
@@ -180,16 +187,16 @@ if [ $PRESERVE_CONFIG -eq 0 ] || [ ! -f $ROOT/.bundle/config ]; then
     fi
     OLDDIR=$PWD
     cd $ROOT
-    ${RUN} bundle config set --local path ${ROOT}/.home/.gems
-    ${RUN} bundle config set --local cache_path ${ROOT}/.home/.cache
-    ${RUN} bundle config set --local with development
+    run bundle config set --local path ${ROOT}/.home/.gems
+    run bundle config set --local cache_path ${ROOT}/.home/.cache
+    run bundle config set --local with development
     cd $OLDDIR
 fi
 
 if [ ! -d $ROOT/.home/.gems ]; then
     OLDDIR=$PWD
     cd $ROOT
-    ${RUN} bundle install
+    run bundle install
     cd $OLDDIR
 fi
 
@@ -198,13 +205,13 @@ if [ ! -f $ROOT/ext/rbi-central/README.md ]; then
 fi
 
 if [ ! -d $ROOT/.home/.venv ]; then
-    ${RUN} /usr/bin/python3 -m venv ${ROOT}/.home/.venv
+    run /usr/bin/python3 -m venv ${ROOT}/.home/.venv
 fi
 
-source ${ROOT}/.home/.venv/bin/activate
+run source ${ROOT}/.home/.venv/bin/activate
 
 if [ ! -f ${ROOT}/.home/.venv/bin/pre-commit ]; then
-    ${RUN} ${ROOT}/.home/.venv/bin/pip install -r requirements.txt
+    run ${ROOT}/.home/.venv/bin/pip install -r requirements.txt
 fi
 
 # if [ ! -f $ROOT/ext/riscv-opcodes/README.md ]; then
@@ -213,14 +220,14 @@ fi
 
 if [[ ! -z "$DEVELOPMENT" && $DEVELOPMENT -eq 1 ]]; then
     if [ ! -d "${ROOT}/.home/.yard/gem_index" ]; then
-        ${RUN} bundle exec --gemfile ${ROOT}/Gemfile yard config --gem-install-yri
-        ${RUN} bundle exec --gemfile ${ROOT}/Gemfile yard gems
+        run bundle exec --gemfile ${ROOT}/Gemfile yard config --gem-install-yri
+        run bundle exec --gemfile ${ROOT}/Gemfile yard gems
         touch ${ROOT}/.stamps/dev_gems
     fi
 fi
 
 if [ ! -d ${ROOT}/node_modules ]; then
-    ${RUN} npm i
+    run npm i
 fi
 
 if [ "${CONTAINER_TYPE}" == "devcontainer" ]; then

do

@@ -18,4 +18,9 @@ fi
 source $ROOT/bin/setup
 
 # really long way of invoking rake, but renamed to 'do'
-$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- "$@"
+EXEC=( exec --gemfile "$ROOT/Gemfile" ruby -r rake -e '"Rake.application.init('"'do'"');Rake.application.load_rakefile;Rake.application.top_level"' -- "$@" )
+if [ "${CONTAINER_TYPE}" == "docker" -o "${CONTAINER_TYPE}" == "podman" ]; then
+  ${BASH} -c "$(printf "%s && " "${CONTAINER_SETUP_CMD[@]}") bundle ${EXEC[*]}"
+else
+  $BUNDLE "${EXEC[@]}"
+fi