Merge pull request #116 from arteniioleg/master

Docker configuration minor improvements
This commit is contained in:
Joey de Vries
2018-08-19 22:55:47 +02:00
committed by GitHub
2 changed files with 4 additions and 6 deletions

View File

@@ -6,12 +6,13 @@ 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 \
wget htop zip unzip nano
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"]
CMD ["sleep", "infinity"]

View File

@@ -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 \
@@ -24,7 +22,6 @@ x11docker \
--clipboard \
--stdout --stderr \
--cap-default \
--no-init \
--workdir ${PROJECT_DIR} \
-- "--cap-add=SYS_PTRACE" \
${IMAGE} \