Skip to content

Commit

Permalink
build: more SELinux labels for Docker volumes (#6061)
Browse files Browse the repository at this point in the history
Ref #6054

Signed-off-by: Zoran Regvart <zoran@regvart.com>
Co-authored-by: Johan Fylling <johan.dev@fylling.se>
  • Loading branch information
zregvart and johanfylling committed Jun 29, 2023
1 parent 372293e commit 1ad3992
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ wasm-sdk-e2e-test: generate
.PHONY: check
check:
ifeq ($(DOCKER_RUNNING), 1)
docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:${GOLANGCI_LINT_VERSION} golangci-lint run -v
docker run --rm -v $(shell pwd):/app:ro,Z -w /app golangci/golangci-lint:${GOLANGCI_LINT_VERSION} golangci-lint run -v
else
@echo "Docker not installed or running. Skipping golangci run."
endif

.PHONY: fmt
fmt:
ifeq ($(DOCKER_RUNNING), 1)
docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:${GOLANGCI_LINT_VERSION} golangci-lint run -v --fix
docker run --rm -v $(shell pwd):/app:Z -w /app golangci/golangci-lint:${GOLANGCI_LINT_VERSION} golangci-lint run -v --fix
else
@echo "Docker not installed or running. Skipping golangci run."
endif
Expand Down
4 changes: 2 additions & 2 deletions build/run-wasm-rego-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function generate_testcases {
--name $TESTGEN_CONTAINER_NAME \
-u $(id -u):$(id -g) \
-v $PWD/.go/bin:/go/bin:Z \
-v $PWD:/src:Z \
-v $PWD:/src:z \
-v $ASSETS:/assets:Z \
-e GOCACHE=/src/.go/cache \
-w /src \
Expand All @@ -65,7 +65,7 @@ function run_testcases {
docker run \
--rm \
--name $TESTRUN_CONTAINER_NAME \
--volumes-from $TESTGEN_CONTAINER_NAME \
--volumes-from $TESTGEN_CONTAINER_NAME:z \
-e VERBOSE=$VERBOSE \
-w /scratch \
node:14 \
Expand Down

0 comments on commit 1ad3992

Please sign in to comment.