From 430d14a9e7479b5011113934ede6312f88dfb6b9 Mon Sep 17 00:00:00 2001 From: Yasuaki Uechi Date: Wed, 27 Dec 2017 15:12:26 +0900 Subject: [PATCH] fix typo --- Dockerfile | 13 +------------ README.md | 15 +++++---------- scripts/bootstrap | 8 -------- scripts/server | 6 ------ 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100755 scripts/bootstrap delete mode 100755 scripts/server diff --git a/Dockerfile b/Dockerfile index cf49e7e..651669e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,15 +14,4 @@ COPY Gemfile /usr/src/app/ 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 +COPY . /usr/src/app \ No newline at end of file diff --git a/README.md b/README.md index 6a84ac8..c5c023b 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,12 @@ -# uechi.io [![Build Status](https://travis-ci.org/uetchy/uetchy.github.io.svg?branch=master)](https://travis-ci.org/uetchy/uetchy.github.io) +# uechi.io + +[![Build Status](https://travis-ci.org/uetchy/uetchy.github.io.svg?branch=master)](https://travis-ci.org/uetchy/uetchy.github.io) ## Build ``` -script/bootstrap -script/server -``` - -### Docker - -``` -docker-compose build -docker-compose up +docker-compose run web bundle install +docker-compose up --build ``` ## Test diff --git a/scripts/bootstrap b/scripts/bootstrap deleted file mode 100755 index c802ab4..0000000 --- a/scripts/bootstrap +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# usage: script/bootstrap -# -# Setup dev env - -gem install bundler -bundle install -npm install \ No newline at end of file diff --git a/scripts/server b/scripts/server deleted file mode 100755 index 9d1395d..0000000 --- a/scripts/server +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# usage: script/server -# -# Run the jekyll server - -bundle exec jekyll serve --baseurl '' --watch --drafts --unpublished