lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL

Browse Source
This commit is contained in:
Joey de Vries
2018-08-23 19:03:10 +02:00
parent d091c7b9c4 b7836922b0
commit 2d6a9b964d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker/Dockerfile
View File

@@ -6,12 +6,13 @@ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
libgtk2.0-0 libcanberra-gtk-module libxext-dev libxrender-dev libxtst-dev libxslt-dev dmz-cursor-theme \ libgtk2.0-0 libcanberra-gtk-module libxext-dev libxrender-dev libxtst-dev libxslt-dev dmz-cursor-theme \
build-essential cmake git \ 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 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 ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
RUN chmod +x /tini RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"] ENTRYPOINT ["/tini", "--"]
CMD ["sleep", "infinity"] CMD ["sleep", "infinity"]

3
docker/ide.sh
View File

@@ -15,8 +15,6 @@ IMAGE=learnopengl
[ -n "$(docker images -q --filter=reference="${IMAGE}")" ] \ [ -n "$(docker images -q --filter=reference="${IMAGE}")" ] \
|| docker build -t ${IMAGE} ${SCRIPT_DIR} || docker build -t ${IMAGE} ${SCRIPT_DIR}
echo "Info about --gpu https://github.com/mviereck/x11docker#dependencies"
x11docker \ x11docker \
--gpu \ --gpu \
--hostdisplay \ --hostdisplay \
@@ -24,7 +22,6 @@ x11docker \
--clipboard \ --clipboard \
--stdout --stderr \ --stdout --stderr \
--cap-default \ --cap-default \
--no-init \
--workdir ${PROJECT_DIR} \ --workdir ${PROJECT_DIR} \
-- "--cap-add=SYS_PTRACE" \ -- "--cap-add=SYS_PTRACE" \
${IMAGE} \ ${IMAGE} \