Skip to content

Commit a0467d3

Browse files
committed
Remove bash
This requires to install ncurses explicitly, which was installed as a dep for bash before, and Vim requires it. Ref: #20 (comment)
1 parent bd22b38 commit a0467d3

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
FROM alpine:3.5
22

3-
RUN apk --update add bash \
4-
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
5-
6-
RUN adduser -h /home -s /bin/bash -D -u 8465 vimtest
3+
RUN adduser -h /home -s /bin/sh -D -u 8465 vimtest
74

85
RUN mkdir -p /vim /vim-build/bin /plugins
96
RUN chown vimtest:vimtest /home /plugins

scripts/argecho.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
echo "Running as: $(whoami)"
44

scripts/install_vim.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
set -e
44

@@ -20,6 +20,8 @@ build() {
2020
[ -z $NAME ] && NAME="vim-${TAG}"
2121
[ -z $TAG ] && bail "-tag is required"
2222

23+
apk add ncurses
24+
2325
VIM_NAME="vim_${TAG}_py${PYTHON}_rb${RUBY}_lua${LUA}"
2426
VIM_PATH="/vim-build/$VIM_NAME"
2527
VIM_BIN="$VIM_PATH/bin/vim"

scripts/run_vim.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
BIN=$1
44
shift
55

6-
if [ "$BIN" == "bash" ] || [ -z "$BIN" ]; then
7-
exec /bin/bash
6+
if [ "$BIN" = "sh" ] || [ -z "$BIN" ]; then
7+
exec /bin/sh
88
fi
99
if ! [ -x "/vim-build/bin/$BIN" ]; then
1010
exec "$BIN" "$@"

0 commit comments

Comments
 (0)