Skip to content

Commit 96b6a19

Browse files
alltillaHofiOne
authored andcommitted
dbld: add SHELL_COMMAND variable
Signed-off-by: Attila Szakacs <[email protected]> Signed-off-by: Hofi <[email protected]>
1 parent fc76465 commit 96b6a19

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dbld/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GIT_RELEASE_TAG=syslog-ng-$(VERSION)
5656
CONFIGURE_OPTS=--enable-debug --enable-manpages --with-python=3 --prefix=/install $(CONFIGURE_ADD)
5757
DBLD_RULES=$(MAKE) --no-print-directory -f $(DBLD_DIR)/rules
5858

59-
DOCKER_SHELL=$(DOCKER) run $(DOCKER_RUN_ARGS) --rm -ti ${CONTAINER_REGISTRY}/dbld-$* /dbld/shell
59+
DOCKER_SHELL=$(DOCKER) run $(DOCKER_RUN_ARGS) --rm -ti ${CONTAINER_REGISTRY}/dbld-$* /dbld/shell $(if $(SHELL_COMMAND),"$(SHELL_COMMAND)",bash)
6060

6161
-include $(if $(RULES_CONF),$(RULES_CONF),$(DBLD_DIR)/rules.conf)
6262

dbld/shell

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ if [ "$IMAGE_PLATFORM" != "devshell" ]; then
1414
echo -e "NOTE: the 'devshell' dbld image is more developer friendly, you might want to use that"
1515
fi
1616
cd /source
17-
debian_chroot="dbld" HOME=/build exec bash
17+
debian_chroot="dbld" HOME=/build exec bash -c "$*"

0 commit comments

Comments
 (0)