From 98aeeece5a335d1b3103a94fd12e9d2682ae8b48 Mon Sep 17 00:00:00 2001 From: arteniioleg Date: Fri, 27 Apr 2018 22:55:37 +0300 Subject: [PATCH 1/3] Dockerfile: install `kmod` package --- docker/Dockerfile | 2 +- docker/ide.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 23faaf3..1ecbc08 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update \ && apt-get install -y \ libgtk2.0-0 libcanberra-gtk-module libxext-dev libxrender-dev libxtst-dev libxslt-dev dmz-cursor-theme \ build-essential cmake git \ - libglfw3-dev libassimp-dev libxinerama-dev libxcursor-dev mesa-utils mesa-utils-extra \ + libglfw3-dev libassimp-dev libxinerama-dev libxcursor-dev mesa-utils mesa-utils-extra kmod \ wget htop zip unzip nano ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini diff --git a/docker/ide.sh b/docker/ide.sh index a24d541..79a1171 100755 --- a/docker/ide.sh +++ b/docker/ide.sh @@ -15,8 +15,6 @@ IMAGE=learnopengl [ -n "$(docker images -q --filter=reference="${IMAGE}")" ] \ || docker build -t ${IMAGE} ${SCRIPT_DIR} -echo "Info about --gpu https://github.com/mviereck/x11docker#dependencies" - x11docker \ --gpu \ --hostdisplay \ From ba90540eea1e964a6bcf1d12ec8a02f296fe24e9 Mon Sep 17 00:00:00 2001 From: arteniioleg Date: Fri, 4 May 2018 16:57:49 +0300 Subject: [PATCH 2/3] dockerfile: clean apt --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1ecbc08..96789ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,11 +7,12 @@ RUN apt-get update \ libgtk2.0-0 libcanberra-gtk-module libxext-dev libxrender-dev libxtst-dev libxslt-dev dmz-cursor-theme \ build-essential cmake git \ libglfw3-dev libassimp-dev libxinerama-dev libxcursor-dev mesa-utils mesa-utils-extra kmod \ - wget htop zip unzip nano + wget htop zip unzip nano \ + && apt-get clean && rm -rf /var/lib/apt/lists/* ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini RUN chmod +x /tini ENTRYPOINT ["/tini", "--"] -CMD ["sleep", "infinity"] \ No newline at end of file +CMD ["sleep", "infinity"] From 8deb4c45a32eba2d7e58b6fb4380ca7ec2290f7d Mon Sep 17 00:00:00 2001 From: arteniioleg Date: Sat, 5 May 2018 11:47:19 +0300 Subject: [PATCH 3/3] docker: removed `x11docker --no-init`, not needed anymore --- docker/ide.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/ide.sh b/docker/ide.sh index 79a1171..5206d1c 100755 --- a/docker/ide.sh +++ b/docker/ide.sh @@ -22,7 +22,6 @@ x11docker \ --clipboard \ --stdout --stderr \ --cap-default \ - --no-init \ --workdir ${PROJECT_DIR} \ -- "--cap-add=SYS_PTRACE" \ ${IMAGE} \