build per-user yq container

Signed-off-by: Yuri Volchkov <yuri@volch.org>

Makefile

@@ -214,6 +214,7 @@ QEMU_OPTS=$(QEMU_OPTS_COMMON) $(QEMU_ACCEL) $(QEMU_OPTS_$(ZARCH)) $(QEMU_OPTS_CO
 GOOS=linux
 CGO_ENABLED=1
 GOBUILDER=eve-build-$(shell echo $(USER) | tr A-Z a-z)
+YQ=yq-$(shell echo $(USER) | tr A-Z a-z)
 
 # if proxy is set, use it when building docker builder
 ifneq ($(HTTP_PROXY),)
@@ -661,6 +662,10 @@ ifneq ($(BUILD),local)
 endif
 	$(QUIET): $@: Succeeded
 
+$(YQ):
+	@echo "Creating go builder image for user $(USER)"
+	$(QUIET)docker build git@github.com:yvolchkov/yq.git \
+		--build-arg USER_ID=$(UID) --build-arg GROUP_ID=$(GID) -t $@
 #
 # Common, generalized rules
 #
@@ -696,7 +701,7 @@ eve-%: pkg/%/Dockerfile build-tools $(RESCAN_DEPS)
 	$(QUIET)if [ -n "$(PRUNE)" ]; then docker image prune -f; fi
 	$(QUIET): "$@: Succeeded (intermediate for pkg/%)"
 
-images/rootfs-%.yml.in: images/rootfs.yml.in FORCE
+images/rootfs-%.yml.in: images/rootfs.yml.in $(YQ) FORCE
 	$(QUITE)tools/compose-image-yml.sh $< $@ "$(ROOTFS_VERSION)-$*-$(ZARCH)"
 
 images-patches := $(wildcard images/*.patch)

tools/compose-image-yml.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 yq() {
-  docker run --rm -i -v "${PWD}":/workdir mikefarah/yq "$@"
+  docker run --rm -i -v "${PWD}":/workdir yq-"${USER}" "$@"
 }
 
 process-image-template() {