From 36b9d8761b74231e1c83f48248947cdf3e0a18b8 Mon Sep 17 00:00:00 2001
From: Luka <luka+git@geluti.org>
Date: Sat, 13 Apr 2019 13:20:51 +0200
Subject: [PATCH] Makefiles knows everyone.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Handling any folder name containing a Dockerfile through the Makefile.
Moreover, some fixes with environment (LD_LIBRARY_PATH has to be, at
least, empty, for the stream to start…) and with gid handling.
---
 Makefile                | 10 +++++++---
 beta-nouveau/Dockerfile |  3 ++-
 beta-nvidia/Dockerfile  |  3 ++-
 beta/Dockerfile         |  3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 65e34d7..cac44c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
-RULES=beta
+AVAILABLE_FOLDERS=$(wildcard */Dockerfile)
+RULES=$(AVAILABLE_FOLDERS:/Dockerfile=)
 
-BUILD_ARGS= --force-rm --build-arg VIDEO_GID=$$(cat /etc/group | grep video | cut -d: -f3)
+IMAGE_NAME=shadow-beta
+BUILD_ARGS=--force-rm --build-arg VIDEO_GID=$$(cat /etc/group | grep video | cut -d: -f3)
+
+run: beta start
 
 start:
 	docker-compose up
 
 ${RULES}:
-	docker-compose build ${BUILD_ARGS} $@
+	docker build -t ${IMAGE_NAME} ${BUILD_ARGS} $@
 
 clean:
 	docker image prune
diff --git a/beta-nouveau/Dockerfile b/beta-nouveau/Dockerfile
index 0945bcd..49faa8c 100644
--- a/beta-nouveau/Dockerfile
+++ b/beta-nouveau/Dockerfile
@@ -58,7 +58,7 @@ RUN mkdir -p /usr/lib/firmware/nouveau/
 RUN cp -a nv* vuc-* usr/lib/firmware/nouveau/
 
 RUN useradd -ms /bin/bash shadowbeta
-RUN usermod -og ${VIDEO_GID:-44} video
+RUN groupmod -og ${VIDEO_GID:-44} video
 RUN usermod -aG video shadowbeta
 RUN usermod -aG input shadowbeta
 
@@ -67,4 +67,5 @@ WORKDIR /home/shadowbeta
 RUN mkdir -p /home/shadowbeta/.config/shadow-dev
 RUN mkdir -p /home/shadowbeta/.cache/blade
 
+ENV LD_LIBRARY_PATH=''
 CMD shadow-dev
diff --git a/beta-nvidia/Dockerfile b/beta-nvidia/Dockerfile
index 080441e..cfdc82b 100644
--- a/beta-nvidia/Dockerfile
+++ b/beta-nvidia/Dockerfile
@@ -54,7 +54,7 @@ ADD https://gitlab.com/aar642/libva-vdpau-driver/-/jobs/167611197/artifacts/raw/
 RUN dpkg -i vdpau-va-driver_0.7.4-6ubuntu1_amd64.deb
 
 RUN useradd -ms /bin/bash shadowbeta
-RUN usermod -og ${VIDEO_GID:-44} video
+RUN groupmod -og ${VIDEO_GID:-44} video
 RUN usermod -aG video shadowbeta
 RUN usermod -aG input shadowbeta
 
@@ -63,4 +63,5 @@ WORKDIR /home/shadowbeta
 RUN mkdir -p /home/shadowbeta/.config/shadow-dev
 RUN mkdir -p /home/shadowbeta/.cache/blade
 
+ENV LD_LIBRARY_PATH=''
 CMD shadow-dev
diff --git a/beta/Dockerfile b/beta/Dockerfile
index 943cc47..e307d1d 100644
--- a/beta/Dockerfile
+++ b/beta/Dockerfile
@@ -53,7 +53,7 @@ RUN cd /tmp; unzip shadow-beta.zip; dpkg --force-all -i "Shadow Beta.deb"
 ADD https://gitlab.com/NicolasGuilloux/shadow-live-os/raw/arch-master/airootfs/etc/drirc /etc/drirc
 
 RUN useradd -ms /bin/bash shadowbeta
-RUN usermod -og ${VIDEO_GID:-44} video
+RUN groupmod -og ${VIDEO_GID:-44} video
 RUN usermod -aG video shadowbeta
 RUN usermod -aG input shadowbeta
 
@@ -62,4 +62,5 @@ WORKDIR /home/shadowbeta
 RUN mkdir -p /home/shadowbeta/.config/shadow-dev
 RUN mkdir -p /home/shadowbeta/.cache/blade
 
+ENV LD_LIBRARY_PATH=''
 CMD shadow-dev
-- 
GitLab