Feature/meta tag (#4)

bitrise-io · Sep 12, 2017 · 1e8f737 · 1e8f737
1 parent bde04e0
commit 1e8f737
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@
 .byebug_history
 # Added by npm-rails
 /node_modules
+
+
+# Ignore docker-compose file
+.env
diff --git 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.
diff --git a/app/views/layouts/buttercms/default.html.erb b/app/views/layouts/buttercms/default.html.erb
@@ -3,7 +3,7 @@
 <head>
     <title><%= content_for?(:html_title) ? "#{content_for(:html_title)} | Bitrise Blog" : "Bitrise Blog" %></title>
 
-    <meta name="description" content="<%= content_for?(:meta_description) ? content_for(:meta_description) : "My Blog" %>">
+    <meta name="description" content="<%= content_for?(:meta_description) ? content_for(:meta_description) : "Articles about Continuous Integration & Delivery, automation, iOS code signing, DevOps, and awesome tech" %>">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta property="og:url"           content="http://blog.bitrise.com" />
     <meta property="og:site_name"     content="Bitrise Blog" />

diff --git 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}"