Simplified Docker configuration

RameenAbdal · Jan 7, 2021 · 7705e96 · 7705e96
1 parent 649d488
commit 7705e96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,7 @@
 FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04
 
-RUN apt-get update && apt-get install python3.7 python3-dev libpython3.7-dev python3-pip cmake git g++ gnupg curl -y
-RUN apt-get install libgl1-mesa-glx libegl1-mesa libxrandr2 libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 libsm6 libxext6 libxrender-dev x11-apps -y
-RUN apt update && apt-get install --reinstall libxcb-xinerama0 libqt5x11extras5 -y
+RUN apt-get update && apt-get install python3.7 python3-dev libpython3.7-dev python3-pip cmake g++ gnupg -y
+RUN apt-get install libgl1-mesa-glx libegl1-mesa libxrandr2 libxrandr2 libxss1 libxcursor1 libxcomposite1 libasound2 libxi6 libxtst6 libsm6 libxext6 libxrender-dev x11-apps libqt5x11extras5 -y
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt install locales -y

diff --git a/README.md b/README.md
@@ -50,15 +50,15 @@ You must have CUDA (>=10.0 && <11.0) and [nvidia-docker2](https://github.com/NVI
 Then, run :
 
 ```bash
-xhost +local:$(id -un) # enabling screen
+xhost +local:docker # Letting Docker access X server
 wget -P stylegan/ http://d36zk2xti64re0.cloudfront.net/stylegan2/networks/stylegan2-ffhq-config-f.pkl
-docker-compose up --build # expect some time before UI appears
+docker-compose up --build # Expect some time before UI appears
 ```
 
 When finished, run :
 
 ```bash
-xhost -local:$(id -un)
+xhost -local:docker
 ```
 
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,5 +11,3 @@ services:
       DISPLAY: $DISPLAY
       QT_X11_NO_MITSHM: 1
       QT_DEBUG_PLUGINS: 1
-      QT_QPA_EGLFS_PHYSICAL_WIDTH: 1920
-      QT_QPA_EGLFS_PHYSICAL_HEIGHT: 1080