Compare commits

..

5 Commits

Author SHA1 Message Date
a5f1b3098a Update LICENSE copyright dates and add @bensuperpc
Update LICENSE copyright dates and add @bensuperpc

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2022-05-18 14:14:05 +02:00
8328c514c1 Merge pull request #689 from Lykos153/improve-podman-support
Improve podman support
2022-05-16 23:44:48 +02:00
2333930f42 Fix permission errors with podman
Fix #649
2022-05-16 15:23:31 +02:00
4887a524ff Check for podman first 2022-05-16 15:08:20 +02:00
f924b46533 Merge pull request #686 from bensuperpc/add-mips-lts
Add mips-lts image
2022-05-16 09:47:32 +02:00
2 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2015, 2016, 2017, 2018 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin
Copyright (c) 2015, 2016, 2017, 2018, 2021 Steeve Morin, Rob Burns, Matthew McCormick, Jean-Christophe-Fillion-Robin, Bensuperpc
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@ -24,10 +24,10 @@ has() {
# If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
if [ -z "$OCI_EXE" ]; then
if which docker >/dev/null 2>/dev/null; then
OCI_EXE=docker
elif which podman >/dev/null 2>/dev/null; then
if which podman >/dev/null 2>/dev/null; then
OCI_EXE=podman
elif which docker >/dev/null 2>/dev/null; then
OCI_EXE=docker
else
die "Cannot find a container executor. Search for docker and podman."
fi
@ -190,7 +190,7 @@ MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
# CYGWIN
CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" -a "$OCI_EXE" != "podman" ]; then
USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
fi