diff --git a/.dockerignore b/.dockerignore index 745841df6..d78e22ef7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,25 @@ -.git/* +# File system +.DS_Store + +# Git +.git/ .gitignore + +# JetBrains +.idea + +# Logs and temps log/* tmp/* + +# Project +db/stringer_test.sqlite +docs/ +screenshots/ +spec/ +.dockerignore +.rspec +.rubocop* +.travis.yml +docker-compose.yml +Dockerfile diff --git a/README.md b/README.md index bf68e7230..29bafc7df 100644 --- a/README.md +++ b/README.md @@ -114,20 +114,30 @@ You can launch an interactive console (a la `rails c`) using `racksh`. ## Acknowledgments -Most of the heavy-lifting is done by [`feedjira`](https://github.com/feedjira/feedjira) and [`feedbag`](https://github.com/dwillis/feedbag). - -General sexiness courtesy of [`Twitter Bootstrap`](http://twitter.github.io/bootstrap/) and [`Flat UI`](http://designmodo.github.io/Flat-UI/). - -ReenieBeanie Font Copyright © 2010 Typeco (james@typeco.com). Licensed under [SIL Open Font License, 1.1](http://scripts.sil.org/OFL). - -Lato Font Copyright © 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com). Licensed under [SIL Open Font License, 1.1](http://scripts.sil.org/OFL). +* This project builds on-top on [swanson/stringer][7] created by: + * Matt Swanson [mdswanson.com][1] [@_swanson][2] + * Victor Koronen [victor.koronen.se][3] [@victorkoronen][4] +* Most of the heavy-lifting is done by [`feedjira`](https://github.com/feedjira/feedjira) and [`feedbag`](https://github.com/dwillis/feedbag). +* General sexiness courtesy of [`Twitter Bootstrap`](http://twitter.github.io/bootstrap/) and [`Flat UI`](http://designmodo.github.io/Flat-UI/). +* ReenieBeanie Font Copyright © 2010 [Typeco][10]. Licensed under [SIL Open Font License, 1.1](http://scripts.sil.org/OFL). +* Lato Font Copyright © 2010-2011 [tyPoland Lukasz Dziedzic][9]. Licensed under [SIL Open Font License, 1.1](http://scripts.sil.org/OFL). ## Contact -If you have a question, feature idea, or are running into problems, our preferred method of contact is to open an issue on GitHub. This allows multiple people to weigh in, and we can keep everything in one place. Thanks! +If you have any questions, feature proposals or are running into problems, the preferred method of contact is to open +an issue on GitHub. This allows multiple people to weigh in, and we can keep everything in one place. Thanks! + +## Maintainer(s) -## Maintainers +Konrad Gibaszewski [gemscrafter.com][5] [@gemscrafter][6] -Matt Swanson, [mdswanson.com](http://mdswanson.com), [@_swanson](http://twitter.com/_swanson) -Victor Koronen, [victor.koronen.se](http://victor.koronen.se/), [@victorkoronen](https://twitter.com/victorkoronen) +[1]: https://mdswanson.com +[2]: https://twitter.com/_swanson +[3]: https://victor.koronen.se +[4]: https://twitter.com/victorkoronen +[5]: https://gemscrafter.com +[6]: https://twitter.com/gemscrafter +[7]: https://github.com/swanson/stringer +[9]: http://www.lukaszdziedzic.eu +[10]: http://www.typeco.com diff --git a/docker-compose.yml b/docker-compose.yml index 06ac17b91..e5c49d859 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,5 @@ version: '2' + services: postgres: image: postgres:9.5-alpine @@ -11,7 +12,7 @@ services: - POSTGRES_DB=stringer web: - image: mdswanson/stringer + image: gemscrafter/stringer depends_on: - postgres restart: always