Merge pull request Vimjas#36 from blueyed/alpine-3.6

Bump Alpine base image to 3.6

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 
 RUN adduser -h /home -s /bin/sh -D -u 8465 vimtest
 

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build push test
 
-TAG:=3
+TAG:=4
 
 build:
 	docker build -t testbed/vim:$(TAG) .

scripts/install_vim.sh

@@ -142,7 +142,8 @@ EOF
     # Some of them will be installed already, but it is a good reference for
     # what is required.
     # luajit is required with Neomvim 0.2.1+ (previously only during build).
-    apk add libuv \
+    apk add gettext \
+      libuv \
       libtermkey \
       libvterm \
       luajit \
@@ -154,11 +155,14 @@ EOF
       ca-certificates \
       cmake \
       g++ \
+      gettext-dev \
       gperf \
       libtool \
       libuv-dev \
       libtermkey-dev \
       libvterm-dev \
+      lua5.1-lpeg \
+      lua5.1-mpack \
       luajit-dev \
       m4 \
       make \
@@ -167,19 +171,6 @@ EOF
       unzip \
       unibilium-dev \
       xz
-
-    # Install luarocks manually for Alpine's luajit.
-    # I could not make it work through LUAROCKS_OPTS in DEPS_CMAKE_FLAGS.
-    ( cd /tmp
-      curl -SL https://luarocks.org/releases/luarocks-2.4.1.tar.gz | tar zxp
-      cd luarocks-*
-      ./configure --lua-suffix=jit --with-lua-bin=/usr/bin/luajit \
-        --with-lua-include=/usr/include/luajit-2.1
-      make bootstrap
-      for rock in lpeg mpack; do
-        luarocks install $rock
-      done
-    )
   else
     bail "Unexpected FLAVOR: $FLAVOR (use vim or neovim)."
   fi