From 90bbcdb4d0e98210d749ffc78ccdcd38a6314a60 Mon Sep 17 00:00:00 2001 From: Oleg Artene Date: Sat, 14 Dec 2019 22:53:33 +0200 Subject: [PATCH 1/2] deleted docker/ --- docker/.dockerignore | 2 -- docker/Dockerfile | 18 ------------------ docker/ide.sh | 28 ---------------------------- 3 files changed, 48 deletions(-) delete mode 100644 docker/.dockerignore delete mode 100644 docker/Dockerfile delete mode 100755 docker/ide.sh diff --git a/docker/.dockerignore b/docker/.dockerignore deleted file mode 100644 index 381951f..0000000 --- a/docker/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -** -!Dockerfile \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 96789ad..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:18.04 - -ARG TINI_VERSION='0.18.0' - -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 kmod \ - 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"] diff --git a/docker/ide.sh b/docker/ide.sh deleted file mode 100755 index 5206d1c..0000000 --- a/docker/ide.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -[ -n "$(which x11docker)" ] \ - || { echo "x11docker is required https://github.com/mviereck/x11docker"; exit 1; } - -SCRIPT_DIR=$(dirname $(readlink -f "$0")) -PROJECT_DIR=$(dirname ${SCRIPT_DIR}) - -CMD=${@} -[ -n "${CMD}" ] \ - || { echo "Command is required"; exit 1; } - -IMAGE=learnopengl - -[ -n "$(docker images -q --filter=reference="${IMAGE}")" ] \ - || docker build -t ${IMAGE} ${SCRIPT_DIR} - -x11docker \ - --gpu \ - --hostdisplay \ - --homedir ${HOME} \ - --clipboard \ - --stdout --stderr \ - --cap-default \ - --workdir ${PROJECT_DIR} \ - -- "--cap-add=SYS_PTRACE" \ - ${IMAGE} \ - ${CMD} From a33c83b680ac1ecd9c75706517c3c1e185bd168e Mon Sep 17 00:00:00 2001 From: Oleg Artene Date: Sat, 14 Dec 2019 22:53:54 +0200 Subject: [PATCH 2/2] readme: added "Linux building in Docker" --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 70558b5..9625461 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,12 @@ Note that CodeBlocks or other IDEs may have issues running the programs due to p Running `ls $LOGL_ROOT_PATH` should list, among other things, this README file and the resources direcory. +### Linux building in Docker +Using [this project](https://github.com/01e9/docker-ide) you can start IDE in docker: +``` +.../docker-ide/ide cpp-gpu ~/.../clion/bin/clion.sh -x11docker "--gpu" +``` + ## Mac OS X building Building on Mac OS X is fairly simple (thanks [@hyperknot](https://github.com/hyperknot)): ```