From 48345c32562fd771f2bc8d33e5f879624ee7b42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E6=9D=BE?= Date: Fri, 30 Sep 2016 14:40:50 +0800 Subject: [PATCH] fix --- Dockerfile | 2 +- conf/vncserver@:1.service | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 conf/vncserver@:1.service diff --git a/Dockerfile b/Dockerfile index 5690959..1ec7826 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,4 @@ RUN wget http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.635/insta ADD ./conf/xstartup /root/.vnc/xstartup RUN echo "xiaosong" | /usr/bin/vncpasswd -f > /root/.vnc/passwd EXPOSE 5901 -ENTRYPOINT ["service", "vncserver", "start"] +CMD ["bash"] diff --git a/conf/vncserver@:1.service b/conf/vncserver@:1.service deleted file mode 100644 index 3d7accf..0000000 --- a/conf/vncserver@:1.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Remote desktop service (VNC) -After=syslog.target network.target - -[Service] -Type=forking -# Clean any existing files in /tmp/.X11-unix environment -ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill :1 > /dev/null 2>&1 || :' -ExecStart=/sbin/runuser -l root -c "/usr/bin/vncserver :1 -geometry 1280x720 -depth 24" -PIDFile=/root/.vnc/%H%i.pid -ExecStop=/bin/sh -c '/usr/bin/vncserver -kill :1 > /dev/null 2>&1 || :' - -[Install] -WantedBy=multi-user.target \ No newline at end of file