Use Github user as the current user when available

replicatedhq · Dec 29, 2023 · d8b8f7a · d8b8f7a
1 parent 8a11a40
commit d8b8f7a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 include Makefile.build.mk
-CURRENT_USER := $(shell id -u -n)
+CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
 MINIO_TAG ?= 0.20231101.183725-r1
 RQLITE_TAG ?= 8.13.5-r0
 DEX_TAG ?= 2.37.0-r12

diff --git a/cmd/imagedeps/testdata/schemahero/replacers/expected/test.mk b/cmd/imagedeps/testdata/schemahero/replacers/expected/test.mk
@@ -1,4 +1,4 @@
-CURRENT_USER := $(shell id -u -n)
+CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
 SCHEMAHERO_TAG ?= 0.13.2
 
 .PHONY: test

diff --git a/cmd/imagedeps/testdata/schemahero/replacers/input/test.mk b/cmd/imagedeps/testdata/schemahero/replacers/input/test.mk
@@ -1,4 +1,4 @@
-CURRENT_USER := $(shell id -u -n)
+CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
 SCHEMAHERO_TAG ?= 0.13.1
 
 .PHONY: test

diff --git a/deploy/kurl/kotsadm/hack/Makefile b/deploy/kurl/kotsadm/hack/Makefile
@@ -37,7 +37,7 @@ generate:
 	DEX_TAG=$(shell source ../../../../.image.env && echo "$$DEX_TAG") \
 		${MAKE} _generate
 
-_generate: CURRENT_USER = $(shell id -u -n)
+_generate: CURRENT_USER = $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
 _generate: generate-tag
 	@cd ../template && ./generate.sh $(KOTS_VERSION) ttl.sh $(CURRENT_USER) 24h $(shell realpath ../../../../bin/kots)
 	@rm -rf kurl/addons/kotsadm/$(KOTS_VERSION)

diff --git a/hack/build-ttl.sh b/hack/build-ttl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-export CURRENT_USER=`id -u -n`
+export CURRENT_USER=${GITHUB_USER:-$(id -u -n)}
 
 make build-ttl.sh
 

diff --git a/kurl_proxy/Makefile b/kurl_proxy/Makefile
@@ -1,5 +1,6 @@
 include ./Makefile.build
-CURRENT_USER := $(shell id -u -n)
+
+CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
 
 .PHONY: test
 test:

diff --git a/migrations/build-ttl.sh b/migrations/build-ttl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-CURRENT_USER=`id -u -n`
+CURRENT_USER=${GITHUB_USER:-$(id -u -n)}
 IMAGE=ttl.sh/${CURRENT_USER}/kotsadm-migrations:24h
 
 docker build -f deploy/Dockerfile -t ${IMAGE} .