starlingx/tools
Code Issues Proposed changes

Merge "debian: sane vimrc"

Browse Source
This commit is contained in:
Zuul 2022-04-21 16:02:54 +00:00 committed by Gerrit Code Review
commit 2e4aaf6ffe
5 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stx/dockerfiles/stx-aptly.Dockerfile
View File

@ -70,6 +70,11 @@ COPY stx/toCOPY/aptly/privkey.rsa /root
RUN gpg --import --pinentry-mode loopback --batch --passphrase starlingx /root/privkey.rsa && \
rm -f /root/privkey.rsa
# Add vimrc
RUN mkdir -p /etc/vim
COPY stx/toCOPY/common/vimrc.local /etc/vim/vimrc.local
RUN chmod 0644 /etc/vim/vimrc.local
# Configure startup
COPY stx/toCOPY/aptly/entrypoint.sh /bin/entrypoint.sh
ENTRYPOINT [ "/bin/entrypoint.sh" ]

5
stx/dockerfiles/stx-builder.Dockerfile
View File

@ -82,3 +82,8 @@ COPY stx/toCOPY/builder/buildrc /root/
COPY stx/toCOPY/builder/pubkey.rsa /root
RUN apt-key add /root/pubkey.rsa && rm -f /root/pubkey.rsa
# Add vimrc
RUN mkdir -p /etc/vim
COPY stx/toCOPY/common/vimrc.local /etc/vim/vimrc.local
RUN chmod 0644 /etc/vim/vimrc.local

5
stx/dockerfiles/stx-lat-tool.Dockerfile
View File

@ -51,5 +51,10 @@ RUN sed -i 's/linux-image-amd64/linux-image-5.10.0-6-amd64-unsigned/g' /opt/LAT/
RUN sed -i 's/Wind River Linux Graphics development .* ostree/StarlingX ostree/g' /opt/LAT/SDK/sysroots/corei7-64-wrs-linux/boot/efi/EFI/BOOT/grub.cfg
# Add vimrc
RUN mkdir /etc/vim
COPY stx/toCOPY/common/vimrc.local /etc/vim/vimrc.local
RUN chmod 0644 /etc/vim/vimrc.local
ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/opt/LAT/lat/latd"]

5
stx/dockerfiles/stx-pkgbuilder.Dockerfile
View File

@ -59,6 +59,11 @@ COPY stx/toCOPY/pkgbuilder/debbuilder.conf /etc/sbuild/sbuild.conf
COPY stx/toCOPY/pkgbuilder/pubkey.rsa /root
RUN apt-key add /root/pubkey.rsa && rm -f /root/pubkey.rsa
# Add vimrc
RUN mkdir -p /etc/vim
COPY stx/toCOPY/common/vimrc.local /etc/vim/vimrc.local
RUN chmod 0644 /etc/vim/vimrc.local
ENTRYPOINT ["/usr/bin/tini", "--"]
WORKDIR /opt
CMD ["python3", "app.py"]

16
stx/toCOPY/common/vimrc.local Normal file
View File

@ -0,0 +1,16 @@
" Indent + disable tabs
set tabstop=4
set softtabstop=4
set shiftwidth=4
set expandtab
" Ignore TTY mouse events
set ttymouse=
" Enable search & syntax highlight
set hlsearch
syntax on
" Restore cursor position
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif