feat: update make shell command
This commit is contained in:
parent
46c9dbfa8e
commit
e899a0c11f
15
Makefile
15
Makefile
|
@ -34,15 +34,8 @@ credentials: \
|
||||||
$(CACHE_DIR)/secrets/credentials.tfvars
|
$(CACHE_DIR)/secrets/credentials.tfvars
|
||||||
|
|
||||||
.PHONY:
|
.PHONY:
|
||||||
shell: toolchain tools
|
shell: build-container
|
||||||
$(call toolchain," \
|
$(call run-container, -v ./secrets:/secrets)
|
||||||
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)
|
|
||||||
|
|
||||||
$(KEY_DIR)/%.asc:
|
$(KEY_DIR)/%.asc:
|
||||||
$(call fetch_pgp_key,$(basename $(notdir $@)))
|
$(call fetch_pgp_key,$(basename $(notdir $@)))
|
||||||
|
@ -141,8 +134,8 @@ build-container:
|
||||||
GPG_TTY ?= $(shell tty)
|
GPG_TTY ?= $(shell tty)
|
||||||
|
|
||||||
define run-container
|
define run-container
|
||||||
docker run -it \
|
docker run -it $(1) \
|
||||||
-e GPG_TTY=$(GPG_TTY) \
|
-e GPG_TTY="$(GPG_TTY)" \
|
||||||
-e GPG_AGENT_INFO=/S.gpg-agent:0:1 \
|
-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 agent-socket):/root/.gnupg-w/S.gpg-agent \
|
||||||
-v $(shell gpgconf --list-dirs homedir):/root/.gnupg:ro \
|
-v $(shell gpgconf --list-dirs homedir):/root/.gnupg:ro \
|
||||||
|
|
Loading…
Reference in New Issue