From c00da95c30796d21e731bd87f82dda388a80da65 Mon Sep 17 00:00:00 2001 From: Yasuaki Uechi Date: Wed, 27 Dec 2017 01:08:11 +0900 Subject: [PATCH] fix dockerfile --- Dockerfile | 35 +++++++++++++++++++++-------------- Gemfile.lock | 32 +++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6a006b..cf49e7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,28 @@ FROM ruby:2.4 -WORKDIR /usr/src/app/ - # see http://stackoverflow.com/questions/38453963/gitlab-ci-setup-error-could-not-find-a-javascript-runtime RUN apt-get update && apt-get install nodejs -y -# set locale -RUN apt-get install -y locales -RUN dpkg-reconfigure locales && \ - locale-gen C.UTF-8 && \ - /usr/sbin/update-locale LANG=C.UTF-8 -RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \ - locale-gen -ENV LC_ALL C.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 +# throw errors if Gemfile has been modified since Gemfile.lock +RUN bundle config --global frozen 1 + +ENV LANG C.UTF-8 + +WORKDIR /usr/src/app -# install gems COPY Gemfile /usr/src/app/ -RUN bundle install \ No newline at end of file +COPY Gemfile.lock /usr/src/app/ +RUN bundle install + +COPY . /usr/src/app + +# set locale +# RUN apt-get install -y locales +# RUN dpkg-reconfigure locales && \ +# locale-gen C.UTF-8 && \ +# /usr/sbin/update-locale LANG=C.UTF-8 +# RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \ +# locale-gen +# ENV LC_ALL C.UTF-8 +# ENV LANG en_US.UTF-8 +# ENV LANGUAGE en_US.UTF-8 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 66008f3..3eaa647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,6 +13,8 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) + commonmarker (0.17.7.1) + ruby-enum (~> 0.5) concurrent-ruby (1.0.5) ethon (0.11.0) ffi (>= 1.3.0) @@ -22,12 +24,13 @@ GEM ffi (1.9.18) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (170) + github-pages (172) activesupport (= 4.2.9) github-pages-health-check (= 1.3.5) jekyll (= 3.6.2) jekyll-avatar (= 0.5.0) jekyll-coffeescript (= 1.0.2) + jekyll-commonmark-ghpages (= 0.1.3) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.9.2) jekyll-gist (= 1.4.1) @@ -38,6 +41,7 @@ GEM jekyll-readme-index (= 0.2.0) jekyll-redirect-from (= 0.12.1) jekyll-relative-links (= 0.5.2) + jekyll-remote-theme (= 0.2.3) jekyll-sass-converter (= 1.5.0) jekyll-seo-tag (= 2.3.0) jekyll-sitemap (= 1.1.1) @@ -91,6 +95,13 @@ GEM jekyll-coffeescript (1.0.2) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) + jekyll-commonmark (1.1.0) + commonmarker (~> 0.14) + jekyll (>= 3.0, < 4.0) + jekyll-commonmark-ghpages (0.1.3) + commonmarker (~> 0.17.6) + jekyll-commonmark (~> 1) + rouge (~> 2) jekyll-default-layout (0.1.4) jekyll (~> 3.0) jekyll-feed (0.9.2) @@ -113,6 +124,10 @@ GEM jekyll (~> 3.3) jekyll-relative-links (0.5.2) jekyll (~> 3.3) + jekyll-remote-theme (0.2.3) + jekyll (~> 3.5) + rubyzip (>= 1.2.1, < 3.0) + typhoeus (>= 0.7, < 2.0) jekyll-sass-converter (1.5.0) sass (~> 3.4) jekyll-seo-tag (2.3.0) @@ -162,8 +177,8 @@ GEM jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.0) jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) + jekyll-watch (1.5.1) + listen (~> 3.0) jemoji (0.8.1) activesupport (~> 4.0, >= 4.2.9) gemoji (~> 3.0) @@ -183,17 +198,20 @@ GEM net-dns (0.8.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) - octokit (4.7.0) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.16.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (2.0.5) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (2.2.1) + ruby-enum (0.7.1) + i18n + rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.5.3) + sass (3.5.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -217,4 +235,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.16.0 + 1.16.1