[docker-base]: Add less, strace, and configuration for vim (#591)

* Add less in docker-base. Add strace in docker_base_dbg.
* Make link vim to vim.tiny and have vim config file
This commit is contained in:
pavel-shirshov 2017-05-11 18:46:11 -07:00 committed by Shuotian Cheng
parent 7663da9510
commit b26ec863e8
4 changed files with 10 additions and 2 deletions

View File

@ -199,6 +199,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
logrotate \ logrotate \
curl \ curl \
kexec-tools \ kexec-tools \
less \
unzip unzip
## Disable kexec supported reboot which was installed by default ## Disable kexec supported reboot which was installed by default

View File

@ -27,10 +27,12 @@ RUN apt-get -y install \
supervisor \ supervisor \
vim-tiny \ vim-tiny \
perl \ perl \
python python \
less
COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"] COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"] COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
COPY ["root/.vimrc", "/root/.vimrc"]
RUN apt-get -y purge \ RUN apt-get -y purge \
exim4 \ exim4 \
@ -44,6 +46,8 @@ RUN apt-get -y install \
{% for dbg_pkg in docker_base_dbgs.split(' ') -%} {% for dbg_pkg in docker_base_dbgs.split(' ') -%}
{{ dbg_pkg }}{{' '}} {{ dbg_pkg }}{{' '}}
{%- endfor %} {%- endfor %}
{% else %}
RUN ln /usr/bin/vim.tiny /usr/bin/vim
{% endif %} {% endif %}
## Clean up apt ## Clean up apt

View File

@ -0,0 +1,2 @@
" enable vim features
set nocompatible

View File

@ -8,7 +8,8 @@ GDB = gdb
VIM = vim VIM = vim
OPENSSH = openssh-client OPENSSH = openssh-client
SSHPASS = sshpass SSHPASS = sshpass
$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS) STRACE = strace
$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
endif endif
SONIC_DOCKER_IMAGES += $(DOCKER_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_BASE)