浏览代码

Update Dockerfile

Kentaro Wada 5 年之前
父节点
当前提交
d41dd8be05
共有 2 个文件被更改,包括 14 次插入20 次删除
  1. 6 5
      README.md
  2. 8 15
      docker/Dockerfile

+ 6 - 5
README.md

@@ -89,12 +89,13 @@ pip install labelme
 You need install [docker](https://www.docker.com), then run below:
 
 ```bash
-wget https://raw.githubusercontent.com/wkentaro/labelme/master/labelme/cli/on_docker.py -O labelme_on_docker
-chmod u+x labelme_on_docker
+# on macOS
+socat TCP-LISTEN:6000,reuseaddr,fork UNIX-CLIENT:\"$DISPLAY\" &
+docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=docker.for.mac.host.internal:0 -v $(pwd):/root/workdir wkentaro/labelme
 
-# Maybe you need http://sourabhbajaj.com/blog/2017/02/07/gui-applications-docker-mac/ on macOS
-./labelme_on_docker examples/tutorial/apc2016_obj3.jpg -O examples/tutorial/apc2016_obj3.json
-./labelme_on_docker examples/semantic_segmentation/data_annotated
+# on Linux
+xhost +
+docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=:0 -v $(pwd):/root/workdir wkentaro/labelme
 ```
 
 ### Ubuntu

+ 8 - 15
docker/Dockerfile

@@ -1,31 +1,24 @@
 FROM ubuntu:xenial
-
-# http://fabiorehm.com/blog/2014/09/11/running-gui-apps-with-docker/
-RUN export uid=1000 gid=1000 && \
-    mkdir -p /home/developer && \
-    echo "developer:x:${uid}:${gid}:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \
-    echo "developer:x:${uid}:" >> /etc/group && \
-    mkdir -p /etc/sudoers.d && \
-    echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \
-    chmod 0440 /etc/sudoers.d/developer && \
-    chown ${uid}:${gid} -R /home/developer
+LABEL maintainer "Kentaro Wada <www.kentaro.wada@gmail.com>"
 
 RUN \
   apt-get update -qq && \
   apt-get upgrade -qq -y && \
   apt-get install -qq -y \
-    # requirements
     git \
     python3 \
     python3-pip \
     python3-matplotlib \
     python3-pyqt5 \
-    # utilities
-    sudo
+    && rm -rf /var/lib/apt/lists/*
 
 RUN python3 -m pip install -U pip setuptools wheel
 
 RUN python3 -m pip install -v git+https://github.com/wkentaro/labelme.git
 
-USER developer
-ENV HOME /home/developer
+RUN mkdir /root/workdir
+
+ENV LANG en-US
+
+WORKDIR /root/workdir
+ENTRYPOINT [ "labelme" ]