Merge pull request #5 from KevinSjoberg/feature/docker-setup

hovsater · web-flow · commit d8be1fb1a964 · 2021-01-01T17:16:44.000+01:00
Feature/docker setup
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ _site
 .sass-cache
 .jekyll-metadata
 .DS_Store
+vendor/bundle
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.8.5"
+gem "jekyll", "~> 3.8"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "jekyll-theme-midnight", "~> 0.1"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,10 +64,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.8.5)
+  jekyll (~> 3.8)
   jekyll-feed (~> 0.6)
   jekyll-theme-midnight (~> 0.1)
   tzinfo-data
 
 BUNDLED WITH
-   2.0.1
+   2.0.2
diff --git a/README.md b/README.md
@@ -0,0 +1,13 @@
+# Atom Community Website
+
+Atom Community website powered by [jekyll](https://jekyllrb.com).
+
+## Development
+
+The easiest way to get started is using [Docker](https://www.docker.com).
+
+```console
+$ docker-compose up
+```
+
+If you're not using Docker, see https://jekyllrb.com/docs/ for how to get started.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,12 @@
+version: "3.8"
+
+services:
+  site:
+    image: jekyll/jekyll:3.8
+    command: ["jekyll", "serve", "-H", "0.0.0.0", "-P", "4000", "--livereload"]
+    ports:
+      - "4000:4000"
+      - "35729:35729"
+    volumes:
+      - ".:/srv/jekyll"
+      - "./vendor/bundle:/usr/local/bundle"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ source "https://rubygems.org"`
`8`	`8`	`#`
`9`	`9`	`# This will help ensure the proper Jekyll version is running.`
`10`	`10`	`# Happy Jekylling!`
`11`		`-gem "jekyll", "~> 3.8.5"`
	`11`	`+gem "jekyll", "~> 3.8"`
`12`	`12`
`13`	`13`	`# This is the default theme for new Jekyll sites. You may change this to anything you like.`
`14`	`14`	`gem "jekyll-theme-midnight", "~> 0.1"`