From 3e598cdb3fbb669e1e2957166ce420dad5475479 Mon Sep 17 00:00:00 2001
From: Hanjo Meinhardt <hanjo@bunix.de>
Date: Fri, 29 Sep 2017 20:17:30 +0200
Subject: [PATCH] update/cleanup dockerfile and parametrize build

---
 .drone.yml | 16 +++++++++++++---
 Dockerfile | 24 +++++++++++-------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 528417d..d5b2ec7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,19 @@
 pipeline:
 
+  build:
+    image: alpine:edge
+    commands:
+      - sed -i 's@<VERSION>@${VERSION}@' Dockerfile
+
   docker:
     image: plugins/docker
     repo: bunix42/jekyll
-    tags: 
-     - ${DRONE_REPO_BRANCH}
-    email: hanjo@bunix.de
+    tags:
+     - ${VERSION}
     secrets: [ docker_username, docker_password ]
+
+matrix:
+  VERSION:
+    - 3.5.0
+    - 3.5.2
+    - 3.6.0
diff --git a/Dockerfile b/Dockerfile
index 4560f7c..2c365d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,17 @@
-FROM alpine:3.4 
+FROM alpine:3.4
 
 MAINTAINER Hanjo Meinhardt <hanjo@bunix.de>
 
 ENV dev_packages="ca-certificates build-base libffi-dev ruby-dev ruby-rdoc ruby-irb"
-  
-RUN apk update && apk upgrade
-  
-RUN apk add ruby ruby-json ${dev_packages}
-  
-RUN rm -rf /var/cache/apk/*
 
-RUN gem install jekyll
-RUN gem install jekyll-paginate
-RUN gem install jekyll-auto-image
-RUN gem install jekyll-tidy
-RUN gem install jekyll-sitemap
-  
+RUN apk update && apk upgrade \
+    && apk add ruby ruby-json ${dev_packages} \
+    && rm -rf /var/cache/apk/*
+
+RUN gem install jekyll -v <VERSION> \
+    && gem install jekyll-paginate \
+    && gem install jekyll-auto-image \
+    && gem install jekyll-tidy \
+    && gem install jekyll-sitemap
+
 RUN apk del ${dev_packages}