public
/
stack
5
0
Fork 0
Code Issues 4 Pull Requests 3 Packages Projects Releases Wiki Activity

Pass in gpg agent and socket to user, add stack repo to container

This commit is contained in:
Danny Grove 2025-07-14 23:19:55 -07:00
parent 32697576a0
commit 6c19aed9aa
Signed by: danny
GPG Key ID: E1F4160251DB4C2E
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -20,7 +20,6 @@ EXTRA_ARGS :=
.DEFAULT_GOAL := .DEFAULT_GOAL :=
.PHONY: default .PHONY: default
default: \ default: \
toolchain \
tools \ tools \
apply apply
@ -28,13 +27,16 @@ default: \
clean: clean:
rm -rf $(CACHE_DIR) rm -rf $(CACHE_DIR)
out:
mkdir out
.PHONY: update-tools .PHONY: update-tools
update-tools: update-tools:
./src/make/update.sh ./src/make/update.sh
.PHONY: shell .PHONY: shell
shell: out/tools-image.digest shell: out/tools-image.digest
$(call run-container, -v ./secrets:/secrets, $(shell cat $<), bin/sh) $(call run-container, -v $${PWD}:/home/user/stack:rw, $(shell cat $<), /bin/bash)
.PHONY: credentials .PHONY: credentials
credentials: \ credentials: \
@ -137,11 +139,12 @@ GPG_TTY ?= $(shell tty)
define run-container define run-container
docker run -it $(1) \ docker run -it $(1) \
-e GPG_TTY="$(GPG_TTY)" \ -v $$PWD/.bashrc:/home/user/.bashrc:ro \
-v $(shell gpgconf --list-dirs agent-socket):/root/.gnupg/S.gpg-agent:ro \ -v $(shell gpgconf --list-dirs socketdir)/:/run/user/1000/gnupg/:ro \
-v $(shell gpgconf --list-dirs homedir):/root/.gnupg:rw \ -v $(shell gpgconf --list-dirs homedir):/home/user/.gnupg:rw \
$(2) \ -e SSH_AUTH_SOCK=/run/user/1000/gnupg/$(shell basename $(shell gpgconf --list-dirs agent-ssh-socket)) \
$(3) --entrypoint $(3) \
$(2)
endef endef
.PHONY: plan .PHONY: plan