Add docker_exec and autodetect podman

scripts/docker_exec.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+# Copyright 2019 Shift Cryptosecurity AG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+PROJECT_NAME="$(basename $(realpath "$DIR/.."))"
+CONTAINER_NAME=$PROJECT_NAME-dev
+
+if [ -n "$CONTAINER_RUNTIME" ]; then
+  RUNTIME="$CONTAINER_RUNTIME"
+elif command -v docker &>/dev/null; then
+  RUNTIME=docker
+elif command -v podman &>/dev/null; then
+  RUNTIME=podman
+else
+  echo "No container runtime found" &>2
+  exit 1
+fi
+
+function docker_cleanup {
+    $RUNTIME exec $IMAGE bash -c "if [ -f $PIDFILE ]; then kill -TERM -\$(cat $PIDFILE); rm $PIDFILE; fi"
+}
+
+# See https://github.com/moby/moby/issues/9098#issuecomment-189743947.
+function docker_exec {
+    IMAGE=$1
+    PIDFILE=/tmp/docker-exec-$$
+    shift
+    trap 'kill $PID; docker_cleanup $IMAGE $PIDFILE' TERM INT
+
+    USERFLAG=""
+    if [ "$RUNTIME" = "docker" ] ; then
+        # Only needed for docker - see the comments in dockerenv.sh.
+        USERFLAG="--user=dockeruser"
+    fi
+
+    $RUNTIME exec $USERFLAG --workdir="$DIR/.." -i $IMAGE bash -c "echo \"\$\$\" > $PIDFILE; eval $*" &
+    PID=$!
+    wait $PID
+    RESULT=$?
+    if [ ! $RESULT -ne 0 ]
+    then
+        exit $RESULT
+    fi
+    trap - TERM INT
+    wait $PID
+    RESULT=$?
+    if [ $RESULT -ne 0 ]
+    then
+        exit $RESULT
+    fi
+}
+
+docker_exec $CONTAINER_NAME "$@"

scripts/dockerenv.sh

@@ -16,8 +16,16 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-# To replace docker with podman set `DOCKER=podman` in your environment
-DOCKER=${DOCKER:-docker}
+if [ -n "$CONTAINER_RUNTIME" ]; then
+  RUNTIME="$CONTAINER_RUNTIME"
+elif command -v docker &>/dev/null; then
+  RUNTIME=docker
+elif command -v podman &>/dev/null; then
+  RUNTIME=podman
+else
+  echo "No container runtime found" &>2
+  exit 1
+fi
 
 if [ "$1" = "release" ] ; then
     MOUNT_DIR=/bb02
@@ -35,65 +43,65 @@ CONTAINER_NAME="$PROJECT_NAME-$CONTAINER_NAME_SUFFIX"
 dockerdev () {
     local repo_path="$DIR/.."
 
-    if ! ${DOCKER} images --filter "reference=${CONTAINER_IMAGE}" | grep -q "${CONTAINER_IMAGE} *${CONTAINER_VERSION}"; then
-        echo "No '${CONTAINER_IMAGE}:${CONTAINER_VERSION}' ${DOCKER} image found! Maybe you need to run
-              '${DOCKER} pull ${CONTAINER_IMAGE}:${CONTAINER_VERSION}'?" >&2
+    if ! $RUNTIME images --filter "reference=${CONTAINER_IMAGE}" | grep -q "${CONTAINER_IMAGE} *${CONTAINER_VERSION}"; then
+        echo "No '${CONTAINER_IMAGE}:${CONTAINER_VERSION}' ${RUNTIME} image found! Maybe you need to run
+              '${RUNTIME} pull ${CONTAINER_IMAGE}:${CONTAINER_VERSION}'?" >&2
         exit 1
     fi
 
     USERFLAG=""
-    if [ "${DOCKER}" = "docker" ] ; then
+    if [ "$RUNTIME" = "docker" ] ; then
         # Only needed for docker - see the comment below.
         USERFLAG="--user=dockeruser"
     fi
 
     # If already running, enter the container.
-    if ${DOCKER} ps --filter "name=^${CONTAINER_NAME}$" | grep -q "$CONTAINER_NAME"; then
-        id_running=$(${DOCKER} inspect ${CONTAINER_NAME} | jq -r '.[0].Image')
-        id_wanted=$(${DOCKER} inspect ${CONTAINER_IMAGE}:${CONTAINER_VERSION} | jq -r '.[0].Id')
+    if $RUNTIME ps --filter "name=^${CONTAINER_NAME}$" | grep -q "$CONTAINER_NAME"; then
+        id_running=$(${RUNTIME} inspect ${CONTAINER_NAME} | jq -r '.[0].Image')
+        id_wanted=$(${RUNTIME} inspect ${CONTAINER_IMAGE}:${CONTAINER_VERSION} | jq -r '.[0].Id')
         # If requested version is same as running version, enter container
         if ! [ $id_wanted == $id_running ] ; then
             echo "Currently running container is not the same version as the requested version"
             echo "Requested version ${CONTAINER_IMAGE}:${CONTAINER_VERSION} ($id_wanted)"
-            echo "Current version $(${DOCKER} inspect ${CONTAINER_NAME} | jq -r '.[0].Config.Image') ($id_running)"
+            echo "Current version $(${RUNTIME} inspect ${CONTAINER_NAME} | jq -r '.[0].Config.Image') ($id_running)"
             exit 1
         else
-            ${DOCKER} exec $USERFLAG --workdir="$MOUNT_DIR" -it "$CONTAINER_NAME" bash
+            $RUNTIME exec $USERFLAG --workdir="$MOUNT_DIR" -it "$CONTAINER_NAME" bash
             return
         fi
     fi
 
-    if ${DOCKER} ps --all --filter "name=^${CONTAINER_NAME}$" | grep -q "$CONTAINER_NAME"; then
-        ${DOCKER} rm "$CONTAINER_NAME"
+    if $RUNTIME ps --all --filter "name=^${CONTAINER_NAME}$" | grep -q "$CONTAINER_NAME"; then
+        $RUNTIME rm "$CONTAINER_NAME"
     fi
 
     # SYS_PTRACE is needed to run address sanitizer
-    ${DOCKER} run \
+    $RUNTIME run \
            --detach \
            --interactive --tty \
            --name="$CONTAINER_NAME" \
            -v "$repo_path":"$MOUNT_DIR" \
            --cap-add SYS_PTRACE \
            ${CONTAINER_IMAGE}:${CONTAINER_VERSION} bash
 
-    if [ "${DOCKER}" = "docker" ] ; then
+    if [ "$RUNTIME" = "docker" ] ; then
         # Use same user/group id as on the host, so that files are not created as root in the
         # mounted volume. Only needed for Docker. On rootless podman, the host user maps to the
         # container root user.
         # If group already exists, don't create it
-        if ! ${DOCKER} exec -it "$CONTAINER_NAME" getent group "$(id -g)" > /dev/null ; then
-            ${DOCKER} exec -it "$CONTAINER_NAME" groupadd -o -g "$(id -g)" dockergroup
+        if ! $RUNTIME exec -it "$CONTAINER_NAME" getent group "$(id -g)" > /dev/null ; then
+            $RUNTIME exec -it "$CONTAINER_NAME" groupadd -o -g "$(id -g)" dockergroup
         fi
-        ${DOCKER} exec -it "$CONTAINER_NAME" useradd -u "$(id -u)" -m -g "$(id -g)" dockeruser
+        $RUNTIME exec -it "$CONTAINER_NAME" useradd -u "$(id -u)" -m -g "$(id -g)" dockeruser
     fi
 
     # Call a second time to enter the container.
     dockerdev
 }
 
 if test "$1" == "stop"; then
-    if ${DOCKER} ps -a | grep -q "$CONTAINER_NAME"; then
-        ${DOCKER} rm -f "$CONTAINER_NAME"
+    if $RUNTIME ps -a | grep -q "$CONTAINER_NAME"; then
+        $RUNTIME stop "$CONTAINER_NAME"
     fi
 else
     dockerdev