Skip to content

Commit

Permalink
[docker-base]: Add less, strace, and configuration for vim (#591)
Browse files Browse the repository at this point in the history
* Add less in docker-base. Add strace in docker_base_dbg.
* Make link vim to vim.tiny and have vim config file
  • Loading branch information
pavel-shirshov authored and Shuotian Cheng committed May 12, 2017
1 parent 7663da9 commit b26ec86
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
logrotate \
curl \
kexec-tools \
less \
unzip

## Disable kexec supported reboot which was installed by default
Expand Down
6 changes: 5 additions & 1 deletion dockers/docker-base/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ RUN apt-get -y install \
supervisor \
vim-tiny \
perl \
python
python \
less

COPY ["etc/rsyslog.conf", "/etc/rsyslog.conf"]
COPY ["etc/rsyslog.d/*", "/etc/rsyslog.d/"]
COPY ["root/.vimrc", "/root/.vimrc"]

RUN apt-get -y purge \
exim4 \
Expand All @@ -44,6 +46,8 @@ RUN apt-get -y install \
{% for dbg_pkg in docker_base_dbgs.split(' ') -%}
{{ dbg_pkg }}{{' '}}
{%- endfor %}
{% else %}
RUN ln /usr/bin/vim.tiny /usr/bin/vim
{% endif %}

## Clean up apt
Expand Down
2 changes: 2 additions & 0 deletions dockers/docker-base/root/.vimrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
" enable vim features
set nocompatible
3 changes: 2 additions & 1 deletion rules/docker-base.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ GDB = gdb
VIM = vim
OPENSSH = openssh-client
SSHPASS = sshpass
$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS)
STRACE = strace
$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS) $(STRACE)
endif

SONIC_DOCKER_IMAGES += $(DOCKER_BASE)

0 comments on commit b26ec86

Please sign in to comment.