Skip to content

Commit 8f116b2

Browse files
authored
Merge pull request #2 from mikz/update
update luacheck & bundle
2 parents 81bec1a + 4f9a785 commit 8f116b2

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.7
22

33
LABEL maintainer "Michal Cichra <[email protected]>"
4-
ENV LUA_VERSION=5.3 LUACHECK_VERSION=0.19.1
4+
ENV LUA_VERSION=5.3 LUACHECK_VERSION=0.21.2
55

66
WORKDIR /tmp
77
COPY Gemfile* /tmp/
88
RUN adduser -D -H -h /code -u 9000 -s /bin/false app \
9-
&& apk add --no-cache luarocks${LUA_VERSION} ruby-bundler ruby-json icu-libs zlib \
10-
lua${LUA_VERSION}-dev build-base curl ruby-dev icu-dev zlib-dev cmake \
9+
&& apk add --no-cache luarocks${LUA_VERSION} ruby-bundler ruby-json icu-libs zlib openssl \
10+
&& apk add --no-cache --virtual build-dependencies \
11+
lua${LUA_VERSION}-dev build-base curl ruby-dev icu-dev zlib-dev openssl-dev cmake \
1112
&& luarocks-${LUA_VERSION} install luacheck ${LUACHECK_VERSION} \
1213
&& luarocks-${LUA_VERSION} install lua-cjson \
1314
&& BUNDLE_SILENCE_ROOT_WARNING=1 bundle install --system \
14-
&& apk del build-base curl lua${LUA_VERSION}-dev ruby-dev zlib-dev icu-dev cmake \
15+
&& apk del build-dependencies \
1516
&& ln -s $(which lua${LUA_VERSION}) /usr/local/bin/lua
1617

1718
USER app

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
charlock_holmes (0.7.3)
5-
escape_utils (1.1.1)
6-
github-linguist (5.0.8)
7-
charlock_holmes (~> 0.7.3)
8-
escape_utils (~> 1.1.0)
4+
charlock_holmes (0.7.6)
5+
escape_utils (1.2.1)
6+
github-linguist (6.0.1)
7+
charlock_holmes (~> 0.7.5)
8+
escape_utils (~> 1.2.0)
99
mime-types (>= 1.19)
1010
rugged (>= 0.25.1)
1111
mime-types (3.1)
1212
mime-types-data (~> 3.2015)
1313
mime-types-data (3.2016.0521)
14-
rugged (0.25.1.1)
14+
rugged (0.27.0)
1515

1616
PLATFORMS
1717
ruby
@@ -20,4 +20,4 @@ DEPENDENCIES
2020
github-linguist!
2121

2222
BUNDLED WITH
23-
1.14.5
23+
1.16.1

0 commit comments

Comments
 (0)