Merge pull request #370 from singnet/angelo/quick-fix

[HOTFIX] fixing some docker-related things that annoys when testing

Author: angeloprobst

Makefile

@@ -68,10 +68,10 @@ bazel: build-image
 	@bash ./src/scripts/bazel.sh $(filter-out $@, $(MAKECMDGOALS))
 
 test-all-no-cache:
-	@$(MAKE) bazel 'test --cache_test_results=no //tests/...'
+	@$(MAKE) bazel 'test --noshow_progress --cache_test_results=no //tests/...'
 
 test-all: build-image
-	@$(MAKE) bazel test //tests/...
+	@$(MAKE) bazel 'test --noshow_progress //tests/...'
 
 lint-all:
 	@$(MAKE) bazel lint \

src/MODULE.bazel.lock

@@ -11,19 +11,17 @@
 #include "attention_broker.pb.h"
 #include "common.pb.h"
 
-// attention_broker_server::AttentionBrokerServer service;
+attention_broker_server::AttentionBrokerServer service;
 
-/*
 void ctrl_c_handler(int) {
     std::cout << "Stopping AttentionBrokerServer..." << std::endl;
     service.graceful_shutdown();
     std::cout << "Done." << std::endl;
     exit(0);
 }
-*/
 
 void run_server(unsigned int port) {
-    attention_broker_server::AttentionBrokerServer service;
+    // attention_broker_server::AttentionBrokerServer service;
     std::string server_address = "0.0.0.0:" + to_string(port);
     // grpc::EnableDefaultHealthCheckService(true);
     // grpc::reflection::InitProtoReflectionServerBuilderPlugin();
@@ -42,7 +40,8 @@ int main(int argc, char* argv[]) {
         exit(1);
     }
     unsigned int port = stoi(argv[1]);
-    // signal(SIGINT, &ctrl_c_handler);
+    signal(SIGINT, &ctrl_c_handler);
+    signal(SIGTERM, &ctrl_c_handler);
     run_server(port);
     return 0;
 }

src/main/attention_broker_main.cc

@@ -2,12 +2,9 @@
 
 set -exou pipefail
 
-NAME=$2
-# rep;ace special chars from name
-NAME=${NAME//[^[:alnum:]]/}
 IMAGE_NAME="das-builder"
-CONTAINER_NAME=$NAME
 BAZEL_CMD="/opt/bazel/bazelisk"
+CONTAINER_NAME="das-bazel-cmd-$(uuidgen | cut -d '-' -f 1)-$(date +%Y%m%d%H%M%S)"
 
 ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
 
@@ -24,11 +21,6 @@ CONTAINER_WORKSPACE_DIR=/opt/das/src
 CONTAINER_BIN_DIR=$CONTAINER_WORKSPACE_DIR/bin
 CONTAINER_CACHE=/home/"${USER}"/.cache
 
-# if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
-#   echo "Removing existing container: ${CONTAINER_NAME}"
-#   docker rm -f "${CONTAINER_NAME}"
-# fi
-
 docker run --rm \
   --user="$(id -u)":"$(id -g)" \
   -e BIN_DIR=$CONTAINER_BIN_DIR \
@@ -42,3 +34,10 @@ docker run --rm \
   --entrypoint "$BAZEL_CMD" \
   "${IMAGE_NAME}" \
   $([ ${BAZEL_JOBS:-x} != x ] && echo --jobs=${BAZEL_JOBS}) "$@"
+
+sleep 1
+
+if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+  echo "Removing existing container: ${CONTAINER_NAME}"
+  _=$(docker rm -f "${CONTAINER_NAME}" 2>&1 > /dev/null || true)
+fi

src/scripts/bazel.sh

@@ -3,7 +3,7 @@
 set -eoux pipefail
 
 BAZELISK_CMD=/opt/bazel/bazelisk
-BAZELISK_BUILD_CMD="${BAZELISK_CMD} build"
+BAZELISK_BUILD_CMD="${BAZELISK_CMD} build --noshow_progress"
 [ "${BAZEL_JOBS:-x}" != "x" ] && BAZELISK_BUILD_CMD="${BAZELISK_BUILD_CMD} --jobs=${BAZEL_JOBS}"
 BAZELISK_RUN_CMD="${BAZELISK_CMD} run"
 BUILD_TARGETS=""

src/scripts/bazel_build.sh

@@ -3,7 +3,7 @@
 set -eoux pipefail
 
 IMAGE_NAME="das-builder"
-CONTAINER_NAME=${IMAGE_NAME}-container
+CONTAINER_NAME="das-builder-$(uuidgen | cut -d '-' -f 1)-$(date +%Y%m%d%H%M%S)"
 
 ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
 
@@ -20,11 +20,6 @@ CONTAINER_WORKSPACE_DIR=/opt/das/src
 CONTAINER_BIN_DIR=$CONTAINER_WORKSPACE_DIR/bin
 CONTAINER_CACHE=/home/${USER}/.cache
 
-if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
-  echo "Removing existing container: ${CONTAINER_NAME}"
-  docker rm -f "${CONTAINER_NAME}"
-fi
-
 docker run --rm \
   --user=$(id -u):$(id -g) \
   --name=$CONTAINER_NAME \
@@ -38,3 +33,9 @@ docker run --rm \
   ${IMAGE_NAME} \
   ./scripts/bazel_build.sh
 
+sleep 1
+
+if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+  echo "Removing existing container: ${CONTAINER_NAME}"
+  _=$(docker rm -f "${CONTAINER_NAME}" 2>&1 > /dev/null || true)
+fi

src/scripts/build.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-CONTAINER_NAME="das-builder-bash"
+IMAGE_NAME="das-builder"
+CONTAINER_NAME="das-builder-bash-$(uuidgen | cut -d '-' -f 1)-$(date +%Y%m%d%H%M%S)"
 
 ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
 
@@ -10,18 +11,20 @@ if [ $# -gt 0 ]; then
     PARAMS=$@
 fi
 
-if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
-  echo "Removing existing container: ${CONTAINER_NAME}"
-  docker rm -f "${CONTAINER_NAME}"
-fi
-
 docker run --rm \
     --net="host" \
     --name=$CONTAINER_NAME \
     $ENV_VARS \
     --volume /tmp:/tmp \
     --volume .:/opt/das \
-    -it das-builder \
+    -it "${IMAGE_NAME}" \
     $PARAMS
 
+
 sleep 1
+
+if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+  echo "Removing existing container: ${CONTAINER_NAME}"
+  _=$(docker rm -f "${CONTAINER_NAME}" 2>&1 > /dev/null || true)
+fi
+

src/scripts/container_tty.sh

@@ -1,24 +1,28 @@
 #!/bin/bash
 
-CONTAINER_NAME="$1"
+set -eoux pipefail
+
+BINARY_NAME="${1}"
 shift
 
-ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
+IMAGE_NAME="das-builder"
+CONTAINER_NAME="das-${BINARY_NAME}-$(uuidgen | cut -d '-' -f 1)-$(date +%Y%m%d%H%M%S)"
 
-if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
-  echo "Removing existing container: ${CONTAINER_NAME}"
-  docker rm -f "${CONTAINER_NAME}"
-fi
+ENV_VARS=$(test -f .env && echo "--env-file=.env" || echo "")
 
 mkdir -p bin
-docker run \
-    --name="$CONTAINER_NAME" \
+docker run --rm \
+    --name="${CONTAINER_NAME}" \
     --network host \
     --volume .:/opt/das \
     --workdir /opt/das \
     $ENV_VARS \
-    das-builder \
-    "src/bin/$CONTAINER_NAME" "$@"
+    "${IMAGE_NAME}" \
+    "src/bin/${BINARY_NAME}" "$@"
 
 sleep 1
-docker rm -f "$CONTAINER_NAME"
+
+if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+  echo "Removing existing container: ${CONTAINER_NAME}"
+  _=$(docker rm -f "${CONTAINER_NAME}" 2>&1 > /dev/null || true)
+fi