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

Update Dockerfile

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