gordonchan commited on
Commit
4203d30
·
verified ·
1 Parent(s): 127b456

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +3 -18
Dockerfile CHANGED
@@ -10,23 +10,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
10
  USER root
11
  WORKDIR /root
12
 
13
- RUN echo "#!/bin/bash\n" > /root/run.sh && \
14
- # 修改密码
15
- echo 'if [ $PASSWD ] ; then' >> /root/run.sh && \
16
- echo ' echo "root:$PASSWD" | chpasswd' >> /root/run.sh && \
17
- echo ' echo $PASSWD | vncpasswd -f > /root/.vnc/passwd' >> /root/run.sh && \
18
- echo 'fi' >> /root/run.sh && \
19
- # SSH
20
- echo "/usr/sbin/sshd -D & source /root/.bashrc" >> /root/run.sh && \
21
- # VNC
22
- #echo 'vncserver -kill :0' >> /root/startup.sh && \ # 1.10.1
23
- #echo '/usr/libexec/vncserver :0' >> /root/startup.sh && \ # 1.12.0
24
- echo '/usr/libexec/vncserver :0' >> /root/run.sh && \
25
- echo "rm -rfv /tmp/.X*-lock /tmp/.X11-unix" >> /root/run.sh && \
26
- echo 'vncserver :0 -geometry $SIZE' >> /root/run.sh && \
27
- echo 'tail -f /root/.vnc/*:0.log' >> /root/run.sh && \
28
- # 可执行脚本
29
- chmod 777 /root/run.sh
30
 
31
  # 用户目录不使用中文
32
  RUN LANG=C xdg-user-dirs-update --force
@@ -35,4 +20,4 @@ RUN LANG=C xdg-user-dirs-update --force
35
  EXPOSE 22 5900 6080 6090 8500 8501 27123 27124
36
 
37
  # 启动脚本
38
- CMD ["/root/run.sh"]
 
10
  USER root
11
  WORKDIR /root
12
 
13
+ COPY /root/startup.sh /opt/run.sh
14
+ RUN chmod 777 /opt/run.sh
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
15
 
16
  # 用户目录不使用中文
17
  RUN LANG=C xdg-user-dirs-update --force
 
20
  EXPOSE 22 5900 6080 6090 8500 8501 27123 27124
21
 
22
  # 启动脚本
23
+ CMD ["/opt/run.sh"]