Skip to content

Commit

Permalink
Merge 735f4fa into bcc2452
Browse files Browse the repository at this point in the history
  • Loading branch information
tomohiro committed Jan 6, 2020
2 parents bcc2452 + 735f4fa commit c9bb64f
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require:
- rubocop-rspec

AllCops:
TargetRubyVersion: 2.6
TargetRubyVersion: 2.7

Metrics/BlockLength:
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.7.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: false

language: ruby
rvm:
- 2.6.5
- 2.7.0

cache: bundler

Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# Build for install dependency RubyGems
FROM ruby:2.6.5-alpine3.10 AS bundle
FROM ruby:2.7.0-alpine3.11 AS bundle

COPY Gemfile .
COPY Gemfile.lock .

RUN set -ex \
&& apk add --update --no-cache build-base=0.5-r1 \
&& bundle install --frozen --jobs=4 --without="test:development" \
&& bundle config frozen true \
&& bundle install --jobs=4 --without="test:development" \
&& rm -rf "${BUNDLE_PATH}/cache/*"

# Build for Sinatra app
FROM ruby:2.6.5-alpine3.10
COPY --from=bundle /usr/local/bundle /usr/local/bundle
FROM ruby:2.7.0-alpine3.11
COPY --from=bundle ${BUNDLE_PATH} ${BUNDLE_PATH}

ENV RACK_ENV=deployment

WORKDIR /usr/src/app
COPY . .

EXPOSE 8080
ENTRYPOINT ["rackup"]
CMD ["--host", "0.0.0.0", "-p", "8080"]
ENTRYPOINT ["bundle"]
CMD ["exec", "rackup", "--host", "0.0.0.0", "-p", "8080"]
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '2.6.5'
ruby '2.7.0'

gem 'fluentd'
gem 'haml'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ DEPENDENCIES
sinatra

RUBY VERSION
ruby 2.6.5p114
ruby 2.7.0p0

BUNDLED WITH
1.17.2
2.1.2
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2012 - 2019 Tomohiro Taira
Copyright (c) 2012 - 2020 Tomohiro Taira

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Fluentular
[![Heroku App](https://img.shields.io/badge/heroku-ready-430098.svg?style=flat-square&logo=heroku&logoColor=white)](https://fluentular.herokuapp.com)
[![LICENSE](https://img.shields.io/github/license/Tomohiro/fluentular.svg?style=flat-square)](LICENSE)
[![LICENSE](https://img.shields.io/github/license/tomohiro/fluentular.svg?style=flat-square)](LICENSE)
================================================================================

a Fluentd regular expression editor

[![Docker Pulls](https://img.shields.io/docker/pulls/tomohiro/fluentular.svg?style=flat-square&logo=docker)](https://hub.docker.com/r/tomohiro/fluentular/)
[![Build Status](https://img.shields.io/travis/tomohiro/fluentular.svg?style=flat-square&logo=travis)](https://travis-ci.org/Tomohiro/fluentular)
[![Coverage Status](https://img.shields.io/coveralls/Tomohiro/fluentular.svg?style=flat-square&logo=coveralls)](https://coveralls.io/github/Tomohiro/fluentular)
[![Code Climate](https://img.shields.io/codeclimate/maintainability-percentage/Tomohiro/fluentular.svg?style=flat-square&logo=code-climate)](https://codeclimate.com/github/Tomohiro/fluentular)
[![Build Status](https://img.shields.io/travis/tomohiro/fluentular.svg?style=flat-square&logo=travis)](https://travis-ci.org/tomohiro/fluentular)
[![Coverage Status](https://img.shields.io/coveralls/tomohiro/fluentular.svg?style=flat-square&logo=coveralls)](https://coveralls.io/github/tomohiro/fluentular)
[![Code Climate](https://img.shields.io/codeclimate/maintainability-percentage/tomohiro/fluentular.svg?style=flat-square&logo=code-climate)](https://codeclimate.com/github/tomohiro/fluentular)
[![Dependabot](https://img.shields.io/badge/dependabot-enabled-success?style=flat-square&logo=dependabot)](https://libraries.io/github/tomohiro/fluentular)


Expand Down Expand Up @@ -44,7 +44,7 @@ Supported Platforms:

Platform | Version
-------- | ---------------------------------------------------------------------
Ruby | Ruby 2.6 (Puma)
Ruby | Ruby 2.7 (Puma)
Docker | 18.09.0 or later


Expand Down Expand Up @@ -94,6 +94,6 @@ Acknowledgment
LICENSE
--------------------------------------------------------------------------------

© 2012 - 2019 Tomohiro Taira.
© 2012 - 2020 Tomohiro Taira.

This project licensed under the MIT license. See [LICENSE](LICENSE) for details.
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Fluentular",
"description": "Fluentular is a Fluentd regular expression editor",
"repository": "https://github.com/Tomohiro/fluentular",
"repository": "https://github.com/tomohiro/fluentular",
"keywords": ["ruby", "sinatra", "fluentd"],
"website": "https://fluentular.herokuapp.com",
"stack": "container"
Expand Down
4 changes: 2 additions & 2 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ module Fluentular
}
}
%body
%a.github-corner(href='https://github.com/Tomohiro/fluentular')
%a.github-corner(href='https://github.com/tomohiro/fluentular')
%svg.octo-icon(width='80px' height='80px' viewBox='0 0 250 250')
%path(d='M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z')
%path.octo-arm(fill='currentColor' d='M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2' style='transform-origin: 130px 106px')
Expand All @@ -144,7 +144,7 @@ module Fluentular
%footer.row.small-centered.columns
%section.small-12.columns
%p
© 2012 - 2019 Made with
© 2012 - 2020 Made with
%i.fa.fa-heart
by
%a(href='https://github.com/tomohiro') Tomohiro Taira
Expand Down

0 comments on commit c9bb64f

Please sign in to comment.