From d8b3dd17c263e57ff58a9ddd0ea850b29ab003f9 Mon Sep 17 00:00:00 2001 From: Gordon Diggs Date: Mon, 15 Aug 2016 17:14:47 -0400 Subject: [PATCH 1/2] Fix building image - ruby-nokogiri seems to not exist as a package anymore, but a newer version of nokogiri installs a bit more easily, so go with that - Fixed environment name so that we actually pin to this commit --- Dockerfile | 6 +++--- Gemfile.lock | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92b149d..02b7954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,12 @@ WORKDIR /usr/src/app COPY Gemfile /usr/src/app/ COPY Gemfile.lock /usr/src/app/ -RUN apk --update add nodejs git ruby ruby-dev ruby-bundler less ruby-nokogiri build-base && \ +RUN apk --update add nodejs git zlib zlib-dev ruby ruby-dev ruby-bundler less build-base && \ bundle install -j 4 && \ - apk del build-base && rm -fr /usr/share/ri + apk del --purge build-base zlib zlib-dev && rm -fr /usr/share/ri ENV CSSLINT_SHA=0e7aeadd02f5babca5152993374043f9f736a116 -RUN npm install -g codeclimate/csslint.git#$CSSLINT_COMMIT +RUN npm install -g codeclimate/csslint.git#$CSSLINT_SHA RUN adduser -u 9000 -D app USER app diff --git a/Gemfile.lock b/Gemfile.lock index cd340ba..99ebd75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,9 +5,11 @@ GEM diff-lcs (1.2.5) json (1.8.3) method_source (0.8.2) - mini_portile (0.6.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + mini_portile2 (2.1.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) From aa2d1d7c5df3c8e4eb2d461d746591dcf3706eb6 Mon Sep 17 00:00:00 2001 From: Gordon Diggs Date: Mon, 15 Aug 2016 17:16:07 -0400 Subject: [PATCH 2/2] Update CSSLint Updates the underlying parser library --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02b7954..950153c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apk --update add nodejs git zlib zlib-dev ruby ruby-dev ruby-bundler less bu bundle install -j 4 && \ apk del --purge build-base zlib zlib-dev && rm -fr /usr/share/ri -ENV CSSLINT_SHA=0e7aeadd02f5babca5152993374043f9f736a116 +ENV CSSLINT_SHA=87aa604a4cbc5125db979576f1b09b35980fcf08 RUN npm install -g codeclimate/csslint.git#$CSSLINT_SHA RUN adduser -u 9000 -D app