From f7917df985170fe2a44d685997c6c51613ffbc03 Mon Sep 17 00:00:00 2001 From: Attila Szakacs Date: Wed, 18 Sep 2024 16:07:40 +0200 Subject: [PATCH] dbld: add SHELL_COMMAND variable Signed-off-by: Attila Szakacs --- dbld/rules | 2 +- dbld/shell | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbld/rules b/dbld/rules index d60281e168..2d803135da 100755 --- a/dbld/rules +++ b/dbld/rules @@ -54,7 +54,7 @@ GIT_RELEASE_TAG=axosyslog-$(VERSION) CONFIGURE_OPTS=--enable-debug --enable-manpages --with-python=3 --prefix=/install $(CONFIGURE_ADD) DBLD_RULES=$(MAKE) --no-print-directory -f $(DBLD_DIR)/rules -DOCKER_SHELL=$(DOCKER) run $(DOCKER_RUN_ARGS) --rm -ti ${CONTAINER_REGISTRY}/axosyslog-dbld-$* /dbld/shell +DOCKER_SHELL=$(DOCKER) run $(DOCKER_RUN_ARGS) --rm -ti ${CONTAINER_REGISTRY}/axosyslog-dbld-$* /dbld/shell $(if $(SHELL_COMMAND),"$(SHELL_COMMAND)",bash) -include $(if $(RULES_CONF),$(RULES_CONF),$(DBLD_DIR)/rules.conf) diff --git a/dbld/shell b/dbld/shell index eebd204000..1f21943ecf 100755 --- a/dbld/shell +++ b/dbld/shell @@ -14,4 +14,4 @@ if [ "$IMAGE_PLATFORM" != "devshell" ]; then echo -e "NOTE: the 'devshell' dbld image is more developer friendly, you might want to use that" fi cd /source -debian_chroot="dbld" HOME=/build exec bash +debian_chroot="dbld" HOME=/build exec bash -c "$*"