From 156de857b36adbaecbaa1743690bd00d4877c14b Mon Sep 17 00:00:00 2001 From: tos-miyake Date: Thu, 17 Jan 2019 21:19:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?ruby=202.5=20=E3=81=B8=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f67369..2180415 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,19 @@ -FROM ruby:2.3.1 +########################################### node ###################################################################### +FROM node:8.15 as node -RUN mkdir -p /var/log/supervisor +RUN apt-get update &&\ + apt-get install -y unzip &&\ + rm -rf /var/lib/apt/lists/* -RUN apt-get update && \ - apt-get install -y mysql-client imagemagick jpegoptim optipng fonts-ipafont cron supervisor unzip --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* +# install chromedriver +WORKDIR /tmp +RUN wget -qnv https://chromedriver.storage.googleapis.com/LATEST_RELEASE -O - | wget -q "https://chromedriver.storage.googleapis.com/`cat`/chromedriver_linux64.zip" && \ + unzip chromedriver_linux64.zip && \ + chmod +x chromedriver && \ +mv chromedriver /usr/bin/ + +####################################################################################################################### +FROM ruby:2.5.3 # install chrome WORKDIR /tmp @@ -13,9 +22,16 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key apt-get update && \ apt-get install -y google-chrome-stable -# install chromedriver -WORKDIR /tmp -RUN wget -qnv https://chromedriver.storage.googleapis.com/LATEST_RELEASE -O - | wget -q "https://chromedriver.storage.googleapis.com/`cat`/chromedriver_linux64.zip" && \ - unzip chromedriver_linux64.zip && \ - chmod +x chromedriver && \ - mv chromedriver /usr/bin/ +COPY --from=node /usr/bin/chromedriver /usr/bin/ +COPY --from=node /usr/local/bin/node /usr/local/bin/ + +ENV LANG ja_JP.UTF-8 +RUN apt-get update &&\ + apt-get install -y mysql-client imagemagick jpegoptim optipng graphviz vim &&\ + rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +RUN gem install bundler +RUN curl -0 -L http://npmjs.org/install.sh | sh From 7534fa9cbe412ee7b182996b0ae4095e345590ba Mon Sep 17 00:00:00 2001 From: tos-miyake Date: Fri, 18 Jan 2019 13:35:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?middleware=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2180415..c813bc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ mv chromedriver /usr/bin/ ####################################################################################################################### FROM ruby:2.5.3 +RUN mkdir -p /var/log/supervisor + # install chrome WORKDIR /tmp RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ @@ -27,7 +29,7 @@ COPY --from=node /usr/local/bin/node /usr/local/bin/ ENV LANG ja_JP.UTF-8 RUN apt-get update &&\ - apt-get install -y mysql-client imagemagick jpegoptim optipng graphviz vim &&\ + apt-get install -y mysql-client imagemagick jpegoptim optipng graphviz fonts-ipafont cron supervisor vim --no-install-recommends &&\ rm -rf /var/lib/apt/lists/* RUN mkdir -p /usr/src/app From 9cdd3603724e978dc3e6ffd1d04f7d850e02ba73 Mon Sep 17 00:00:00 2001 From: tos-miyake Date: Wed, 26 Jun 2019 10:30:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?rubocop=20charenger=E3=81=A7=E3=81=AEbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit invalid byte sequence in US-ASCII https://circleci.com/gh/sikmi/bondo-api/11087?utm_campaign=chatroom-integration&utm_medium=referral&utm_source=slack --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c813bc3..e4e375a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key COPY --from=node /usr/bin/chromedriver /usr/bin/ COPY --from=node /usr/local/bin/node /usr/local/bin/ +ENV RUBYOPT -EUTF-8 ENV LANG ja_JP.UTF-8 RUN apt-get update &&\ apt-get install -y mysql-client imagemagick jpegoptim optipng graphviz fonts-ipafont cron supervisor vim --no-install-recommends &&\