From 7f8b318b9a140ae2ae7c6b81ded15f95e6b71083 Mon Sep 17 00:00:00 2001 From: Felipe M Date: Sat, 26 Dec 2020 20:42:26 +0100 Subject: [PATCH] docker -> podman --- Dockerfile | 11 +++++++---- docker-build.sh | 13 ------------- podman-build.sh | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 17 deletions(-) delete mode 100755 docker-build.sh create mode 100755 podman-build.sh diff --git a/Dockerfile b/Dockerfile index 74c4c7b..11197a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,14 @@ -FROM archlinux/base:latest +FROM docker.io/archlinux/base:latest LABEL MAINTAINER "Felipe Martin " COPY requirements.txt /tmp/requirements.txt -RUN pacman -Syu --noconfirm python python-pip base-devel && \ - pip install -r /tmp/requirements.txt && \ - useradd builder +RUN pacman -Syyu --noconfirm python python-pip base-devel +RUN pip install -r /tmp/requirements.txt +RUN useradd builder -u 1000 +RUN chown -R 1000:1000 /tmp +RUN echo "builder ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/builder +RUN echo "nameserver 9.9.9.9" > /etc/resolv.conf USER builder diff --git a/docker-build.sh b/docker-build.sh deleted file mode 100755 index 864f0c2..0000000 --- a/docker-build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -xe - -NAME=$1 - -docker build -t aur-package-builder . - -clear - -docker run -it --rm \ - -e PACKAGE_NAME="$NAME" \ - -v "$PWD/$NAME:/tmp/$NAME" \ - -v "$PWD/templates:/tmp/templates" \ - aur-package-builder diff --git a/podman-build.sh b/podman-build.sh new file mode 100755 index 0000000..6907b76 --- /dev/null +++ b/podman-build.sh @@ -0,0 +1,14 @@ +#!/bin/bash -xe + +NAME=$1 + +podman build -t aur-package-builder . + +clear + +podman run -it --rm \ + -e PACKAGE_NAME="$NAME" \ + -v "$PWD/$NAME:/tmp/$NAME:rw" \ + -v "$PWD/templates:/tmp/templates" \ + --userns=keep-id --user=$(id -ur):$(id -gr) \ + aur-package-builder