Skip to content

Commit

Permalink
Merge pull request #16 from tk3fftk/update-dockerfile
Browse files Browse the repository at this point in the history
update Dockerfile
  • Loading branch information
jerrywdlee authored Jan 11, 2021
2 parents cb7a928 + a62532d commit 70a14c9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: ruby
rvm:
- 2.6.3
- 2.7.2
before_install:
- gem install bundler -v '> 2'
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
- curl https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip > fonts.zip
- curl https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip > fonts.zip
- unzip -oj fonts.zip -d fonts/ && rm -rf fonts.zip
script:
- bundle exec rspec
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-alpine
FROM ruby:2-alpine

# Setup
RUN set -x && apk update && apk upgrade && apk add --no-cache \
Expand All @@ -13,8 +13,8 @@ ADD ./ /usr/src/app/
WORKDIR /usr/src/app

RUN bundle install
RUN curl https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip > fonts.zip && \
RUN curl https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip > fonts.zip && \
unzip -oj fonts.zip -d fonts/ && rm -rf fonts.zip

EXPOSE 4567
CMD ["bundle exec ruby app.rb", "-o", "0.0.0.0", "-p", "4567"]
CMD ["bundle", "exec", "ruby", "app.rb", "-o", "0.0.0.0", "-p", "4567"]
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ YAMLもしくはテキストファイル形式で書かれた[スタイル](http
* Ruby >= v2.3
* bundler >= 2.0
* [ImageMagick](https://imagemagick.org/index.php)
* [IAPexフォント](https://ipafont.ipa.go.jp/node193#jp)
* [IAPexフォント](https://moji.or.jp/ipafont/)

### MacOS
#### 依存パケージのインストール
Expand All @@ -38,11 +38,11 @@ $ bundle install

#### フォントのダウンロード、バージョンは適宜に替えていいです
```sh
$ curl https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip > fonts.zip
$ curl https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip > fonts.zip
$ unzip -oj fonts.zip -d fonts/ && rm -rf fonts.zip
```

上記コマンドを使わなくても、[ここ](https://ipafont.ipa.go.jp/node193#jp)よりフォントを
上記コマンドを使わなくても、[ここ](https://moji.or.jp/ipafont/)よりフォントを
ダウンロードして、下記の配置になるよう解凍すればいい。

```
Expand Down

0 comments on commit 70a14c9

Please sign in to comment.