diff --git a/.gitignore b/.gitignore index 0b4b0387..42d475fe 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,7 @@ .byebug_history # Added by npm-rails /node_modules + + +# Ignore docker-compose file +.env \ No newline at end of file diff --git a/README.md b/README.md index 7db80e4c..00cf7ecf 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,5 @@ -# README +# Bitrise - Blog -This README would normally document whatever steps are necessary to get the -application up and running. +## Local develop environment setup -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... +The first step to specify the API tokens in an environment file named `.env`. The two required keys are `BUTTER_TOKEN` and `MAILCHIMP_API_TOKEN`, which have to be declared such as `KEY=VALUE`. When it's done you just have to run `docker-compose up` and the site starts in local on the port 3000. \ No newline at end of file diff --git a/app/views/layouts/buttercms/default.html.erb b/app/views/layouts/buttercms/default.html.erb index c23f49f1..9cb7373c 100644 --- a/app/views/layouts/buttercms/default.html.erb +++ b/app/views/layouts/buttercms/default.html.erb @@ -3,7 +3,7 @@ <%= content_for?(:html_title) ? "#{content_for(:html_title)} | Bitrise Blog" : "Bitrise Blog" %> - "> + "> diff --git a/docker-compose.yml b/docker-compose.yml index 883ed70f..1fcb8696 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,10 @@ services: - .:/app ports: - "3000:3000" + env_file: + - .env environment: - BUTTER_TOKEN: "3456909bd267a2d5404d593fb4dbe705d29c1c69" - MAILCHIMP_API_TOKEN: cf611633665c93ab78e0f2bb9f307999-us1 + BUTTER_TOKEN: "${BUTTER_TOKEN}" + MAILCHIMP_API_TOKEN: "${MAILCHIMP_API_TOKEN}" MAILCHIMP_API_SERVER: "https://us1.api.mailchimp.com/3.0" - MAILCHIMP_LIST_ID: "dc071eba1c" + MAILCHIMP_LIST_ID: "${MAILCHIMP_LIST_ID}"