From 72a5ac87454f98738e6e12d0ddea001edbb78f87 Mon Sep 17 00:00:00 2001
From: zlzhao <alvisisme@163.com>
Date: Wed, 20 Mar 2019 23:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5Dockerfile=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                 | 14 ++++++++++++--
 setup.sh                   |  2 +-
 vim/install_basic_vimrc.sh |  6 ++++++
 vim/install_vimrc.sh       |  6 +++---
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 vim/install_basic_vimrc.sh

diff --git a/Dockerfile b/Dockerfile
index 18c02dc..970fd44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,14 @@
-FROM ubuntu:16.04
+FROM alvisisme/docker-ubuntu-1604-163
 LABEL maintainer="Alvis Zhao <alvisisme@163.com>"
 RUN apt-get update && \
-    apt-get install -y git vim zsh tmux
\ No newline at end of file
+    apt-get install -y git vim zsh tmux && \
+    chsh -s $(which zsh)
+
+COPY zsh /root/.oh-my-zsh
+COPY zsh/templates/zshrc.zsh-template /root/.zshrc
+COPY tmux/.tmux.conf /root/.tmux.conf
+COPY tmux/.tmux.conf.local /root/.tmux.conf.local
+COPY vim /root/.vim_runtime
+RUN sh /root/.vim_runtime/install_basic_vimrc.sh
+
+ENTRYPOINT [ "/bin/zsh" ]
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 967f7e9..e4ee33b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,7 +10,7 @@ ln -s -f ~/.oh-my-terminal/tmux/.tmux.conf.local ~/.tmux.conf.local
 
 # vim
 cp -r ~/.oh-my-terminal/vim ~/.vim_runtime
-sh ~/.vim_runtime/install_vimrc.sh
+sh ~/.vim_runtime/install_basic_vimrc.sh
 
 # 切换当前用户默认shell，重新进入终端后生效
 chsh -s $(which zsh)
\ No newline at end of file
diff --git a/vim/install_basic_vimrc.sh b/vim/install_basic_vimrc.sh
new file mode 100644
index 0000000..efbe2a8
--- /dev/null
+++ b/vim/install_basic_vimrc.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+cd ~/.vim_runtime
+cat ~/.vim_runtime/vimrcs/basic.vim > ~/.vimrc
+echo "Installed the Basic Vim configuration successfully! Enjoy :-)"
\ No newline at end of file
diff --git a/vim/install_vimrc.sh b/vim/install_vimrc.sh
index 35f852d..a516dc4 100644
--- a/vim/install_vimrc.sh
+++ b/vim/install_vimrc.sh
@@ -1,15 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 cd ~/.vim_runtime
 echo 'set runtimepath+=~/.vim_runtime
 
 source ~/.vim_runtime/vimrcs/basic.vim
-source ~/.vim_runtime/vimrcs/plugins_config.vim
+#source ~/.vim_runtime/vimrcs/plugins_config.vim
 
 try
 source ~/.vim_runtime/my_configs.vim
 catch
 endtry' > ~/.vimrc
 
-echo "Installed the Vim configuration successfully! Enjoy :-)"
+echo "Installed the Super Vim configuration successfully! Enjoy :-)"