From c7431936ec0a68db21959b2b05e3593ccd0ffc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Tue, 2 Nov 2021 19:29:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Minor=20fixes=20and=20tweaks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 +++-- vimrc | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 vimrc diff --git a/Dockerfile b/Dockerfile index 90ac620..910b090 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV \ KUBECTL_VERSION=1.22.2 \ SHIP_VERSION=0.51.3 ENV COMPLETIONS=/usr/share/bash-completion/completions -RUN apk add apache2-utils bash bash-completion curl git jq libintl ncurses openssh openssl sudo tmux tree vim +RUN apk add apache2-utils bash bash-completion curl file git jq libintl ncurses openssh openssl sudo tmux tree vim # Install a bunch of binaries, scripts, tools, etc. @@ -53,7 +53,7 @@ COPY --from=tiltdev/tilt /usr/local/bin/tilt /usr/local/bin/tilt RUN tilt completion bash > $COMPLETIONS/tilt.bash RUN curl -fsSLo /usr/local/bin/skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64 \ && chmod +x /usr/local/bin/skaffold -RUN skaffold completion bash > $COPMLETIONS/skaffold.bash +RUN skaffold completion bash > $COMPLETIONS/skaffold.bash RUN curl -fsSLo /usr/local/bin/kompose https://github.com/kubernetes/kompose/releases/latest/download/kompose-linux-amd64 \ && chmod +x /usr/local/bin/kompose RUN kompose completion bash > $COMPLETIONS/kompose.bash @@ -77,6 +77,7 @@ RUN mkdir /tmp/krew \ && rm -rf /tmp/krew COPY --chown=1000:1000 bash_profile /home/k8s/.bash_profile COPY --chown=1000:1000 kubeconfig /home/k8s/.kube/config +COPY --chown=1000:1000 vimrc /home/k8s/.vimrc COPY motd /etc/motd COPY setup-tailhist.sh /usr/local/bin diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..4621309 --- /dev/null +++ b/vimrc @@ -0,0 +1,7 @@ +syntax on +set autoindent +set expandtab +set number +set shiftwidth=2 +set softtabstop=2 +set nowrap