feat: update make shell command

This commit is contained in:
Anton Livaja 2025-05-07 07:45:56 -07:00
parent 46c9dbfa8e
commit e899a0c11f
Signed by: anton
GPG Key ID: 44A86CFF1FDF0E85
1 changed files with 4 additions and 11 deletions

View File

@ -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 \