From d73e44d09d893a54b85f686905cee04174716132 Mon Sep 17 00:00:00 2001 From: Greg <2582552+gdvalle@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:44:01 -0500 Subject: [PATCH] ci: fix makefile docker ownership (#1386) Co-authored-by: Liudmila Molkova --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e897511f77..4cb81c253e 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,8 @@ WEAVER_CONTAINER=$(shell cat dependencies.Dockerfile | awk '$$4=="weaver" {print SEMCONVGEN_CONTAINER=$(shell cat dependencies.Dockerfile | awk '$$4=="semconvgen" {print $$2}') OPA_CONTAINER=$(shell cat dependencies.Dockerfile | awk '$$4=="opa" {print $$2}') +DOCKER_USER=$(shell id -u):$(shell id -g) + # TODO: add `yamllint` step to `all` after making sure it works on Mac. .PHONY: all @@ -114,7 +116,7 @@ yamllint: .PHONY: table-generation table-generation: docker run --rm \ - -u $(id -u ${USER}):$(id -g ${USER}) \ + -u $(DOCKER_USER) \ --mount 'type=bind,source=$(PWD)/templates,target=/home/weaver/templates,readonly' \ --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ --mount 'type=bind,source=$(PWD)/docs,target=/home/weaver/target' \ @@ -129,7 +131,7 @@ table-generation: .PHONY: attribute-registry-generation attribute-registry-generation: docker run --rm \ - -u $(id -u ${USER}):$(id -g ${USER}) \ + -u $(DOCKER_USER) \ --mount 'type=bind,source=$(PWD)/templates,target=/home/weaver/templates,readonly' \ --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ --mount 'type=bind,source=$(PWD)/docs,target=/home/weaver/target' \ @@ -227,7 +229,6 @@ LATEST_RELEASED_SEMCONV_VERSION := $(shell git ls-remote --tags https://github.c .PHONY: check-policies check-policies: docker run --rm \ - -u $(id -u ${USER}):$(id -g ${USER}) \ --mount 'type=bind,source=$(PWD)/policies,target=/home/weaver/policies,readonly' \ --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ ${WEAVER_CONTAINER} registry check \