RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #18671 from keestux/add-podman-support

Browse Source 
Add podman support
This commit is contained in:
benpicco 2022-10-06 00:38:25 +02:00 committed by GitHub
commit 2b088f3910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefiles/docker.inc.mk
View File

@ -1,4 +1,4 @@
export DOCKER_IMAGE ?= riot/riotbuild:latest
export DOCKER_IMAGE ?= docker.io/riot/riotbuild:latest
export DOCKER_BUILD_ROOT ?= /data/riotbuild
DOCKER_RIOTBASE ?= $(DOCKER_BUILD_ROOT)/riotbase
# List of Docker-enabled make goals
@ -118,13 +118,15 @@ DOCKER_OVERRIDE_CMDLINE += $(strip $(DOCKER_OVERRIDE_CMDLINE_AUTO))
# Overwrite if you want to use `docker` with sudo
DOCKER ?= docker
_docker_is_podman = $(shell $(DOCKER) --version | grep podman 2>/dev/null)
# Set default run flags:
# - allocate a pseudo-tty
# - remove container on exit
# - set username/UID to executor
DOCKER_USER ?= $$(id -u)
DOCKER_RUN_FLAGS ?= --rm --tty --user $(DOCKER_USER)
DOCKER_USER_OPT = $(if $(_docker_is_podman),--userns keep-id,--user $(DOCKER_USER))
DOCKER_RUN_FLAGS ?= --rm --tty $(DOCKER_USER_OPT)
# allow setting make args from command line like '-j'
DOCKER_MAKE_ARGS ?=