aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeikka Kähkönen <veikka.kahkonen@aalto.fi>2017-09-25 15:56:43 +0300
committerVeikka Kähkönen <veikka.kahkonen@aalto.fi>2017-09-25 15:56:43 +0300
commit8b9fdd13beeca586cb2bf34e7abfb621708742fd (patch)
treea8b02fa893086af79963894ed34c21bb92047213
parent5a568946dbd48900539567f4f385489c43f90d21 (diff)
Dockerize
-rw-r--r--docker-compose.yml18
-rw-r--r--jekyll.docker10
-rw-r--r--nginx.conf14
-rw-r--r--nginx.docker4
4 files changed, 46 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..32f978a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "2"
+services:
+ jekyllbuild:
+ build:
+ context: "."
+ dockerfile: "jekyll.docker"
+ volumes_from:
+ - nginx
+
+ nginx:
+ build:
+ context: "."
+ dockerfile: "nginx.docker"
+ ports:
+ - "8080:80"
+ volumes:
+ - /usr/share/nginx/html
+ - ".:/data/site-git"
diff --git a/jekyll.docker b/jekyll.docker
new file mode 100644
index 0000000..ebb5518
--- /dev/null
+++ b/jekyll.docker
@@ -0,0 +1,10 @@
+FROM alpine
+MAINTAINER Your Name "your@name.com"
+
+RUN apk update
+RUN apk add ruby ruby-dev libffi-dev build-base
+RUN gem install jekyll json --no-doc --no-ri
+
+VOLUME ["/usr/share/nginx/html"]
+
+CMD ["jekyll", "build", "--source=/data/site-git", "--destination=/usr/share/nginx/html"]
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..02e8dab
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,14 @@
+server {
+ listen 80;
+ server_name localhost;
+
+ location ~ ^/ {
+ root /usr/share/nginx/html;
+ try_files $uri $uri/index.html;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root /usr/share/nginx/html;
+ }
+}
diff --git a/nginx.docker b/nginx.docker
new file mode 100644
index 0000000..c47a33e
--- /dev/null
+++ b/nginx.docker
@@ -0,0 +1,4 @@
+FROM nginx
+MAINTAINER Your Name "your@name.com"
+
+ADD nginx.conf /etc/nginx/conf.d/default.conf