From 1972b844227fd7dd76b91e95cff6241d7e5c8978 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 9 Feb 2021 01:36:07 +0100
Subject: [PATCH] Fix dockerfile
---
Dockerfile | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6acf6d7..1048e3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,15 @@ ARG SDK_VERSION
FROM k8r.eu/justjanne/android-sdk:$SDK_VERSION
RUN apt-get --quiet update --yes && \
- apt-get --quiet install --yes python3 python3-lxml uidmap iptables
+ apt-get --quiet install --yes python3 python3-lxml podman
-WORKDIR /usr/local/bin
-RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz && tar -zxvf docker-*.tgz
-RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.3.tgz && tar -zxvf docker-rootless-extras*.tgz
-
-ARG XDG_RUNTIME_DIR=/root/.docker/run
-ARG DOCKER_HOST=unix:///root/.docker/run/docker.sock
+ARG UID=1000
+ARG GID=1000
+RUN mkdir /build && \
+ chown $UID:$GID /build && \
+ groupadd --gid ${GID} build && \
+ useradd --uid ${UID} --gid ${GID} --home /build build
+WORKDIR /build
+RUN podman system service -t 0 tcp:localhost:8880 &
+ENV DOCKER_HOST=tcp://localhost:8880
+ENV TESTCONTAINERS_RYUK_DISABLED=true
--
GitLab