From 99ba2fe12cbc571474bb11947b57029fb6d77a63 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 23 Apr 2021 12:08:15 -0700 Subject: [PATCH] Makefile: Use podman as a user for testing and docs --- .github/workflows/tests.yml | 2 +- Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7860f583..8ab4c985 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: "Clone Repository" uses: actions/checkout@v2 - name: Run lorax tests in podman - run: make test-in-docker && cp .test-results/.coverage .coverage + run: sudo make test-in-podman && cp .test-results/.coverage .coverage - name: Coveralls uses: AndreMiras/coveralls-python-action@develop with: diff --git a/Makefile b/Makefile index af3f11e4..8a8f278e 100644 --- a/Makefile +++ b/Makefile @@ -112,9 +112,9 @@ test-in-copy: test-in-docker: test-in-podman test-in-podman: - sudo $(DOCKER) build -t welder/lorax-tests:$(IMAGE_RELEASE) -f Dockerfile.test . + $(DOCKER) build -t welder/lorax-tests:$(IMAGE_RELEASE) -f Dockerfile.test . @mkdir -p `pwd`/.test-results - sudo $(DOCKER) run --rm -it -v `pwd`/.test-results/:/test-results \ + $(DOCKER) run --rm -it -v `pwd`/.test-results/:/test-results \ -v `pwd`:/lorax-ro:ro --security-opt label=disable \ --env RUN_TESTS="$(RUN_TESTS)" \ welder/lorax-tests:$(IMAGE_RELEASE) make test-in-copy @@ -123,7 +123,7 @@ test-in-podman: docs-in-docker: docs-in-podman docs-in-podman: - sudo $(DOCKER) run -it --rm -v `pwd`:/lorax-ro:ro \ + $(DOCKER) run -it --rm -v `pwd`:/lorax-ro:ro \ -v `pwd`/docs/:/lorax-ro/docs/ \ --env LORAX_VERSION=$(DOCS_VERSION) \ --env LOCAL_UID=`id -u` --env LOCAL_GID=`id -g` \