From e899a0c11f207bf4b68b421aa998b50740002386 Mon Sep 17 00:00:00 2001 From: Anton Livaja Date: Wed, 7 May 2025 07:45:56 -0700 Subject: [PATCH] feat: update make shell command --- Makefile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 204c3b9..d9c091b 100644 --- a/Makefile +++ b/Makefile @@ -34,15 +34,8 @@ credentials: \ $(CACHE_DIR)/secrets/credentials.tfvars .PHONY: -shell: toolchain tools - $(call toolchain," \ - HOST_OS=linux \ - HOST_ARCH=x86_64 \ - PREFIX=.local \ - XDG_CONFIG_HOME=/home/build/.config \ - make -f src/make/tools.mk tools-install \ - && PS1='build@distrust-stack\\$$ ' bash --norc \ - ",--interactive) +shell: build-container + $(call run-container, -v ./secrets:/secrets) $(KEY_DIR)/%.asc: $(call fetch_pgp_key,$(basename $(notdir $@))) @@ -141,8 +134,8 @@ build-container: GPG_TTY ?= $(shell tty) define run-container - docker run -it \ - -e GPG_TTY=$(GPG_TTY) \ + docker run -it $(1) \ + -e GPG_TTY="$(GPG_TTY)" \ -e GPG_AGENT_INFO=/S.gpg-agent:0:1 \ -v $(shell gpgconf --list-dirs agent-socket):/root/.gnupg-w/S.gpg-agent \ -v $(shell gpgconf --list-dirs homedir):/root/.gnupg:ro \