From 341e29bb432736b93eb44472ccb02294802ffc70 Mon Sep 17 00:00:00 2001
From: Hanjo Meinhardt <hanjo.meinhardt@flyacts.com>
Date: Tue, 26 Oct 2021 23:14:56 +0200
Subject: [PATCH] cleanup and use build args

---
 .drone.yml | 13 +++++--------
 Dockerfile | 10 +++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 3e1b565..76980e2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,15 +1,12 @@
 pipeline:
 
-  build:
-    image: alpine:edge
-    commands:
-      - sed -i 's@<VERSION>@${VERSION}@' Dockerfile
-
   docker:
     image: plugins/docker
     repo: bunix42/jekyll
+    build_args:
+      - JEKYLL_VERSION=3.8.6
     tags:
-     - ${VERSION}
+      - ${JEKYLL_VERSION}
     secrets: [ docker_username, docker_password ]
 
   slack:
@@ -19,8 +16,8 @@ pipeline:
     secrets: [ slack_webhook ]
 
 matrix:
-  VERSION:
+  JEKYLL_VERSION:
     - 3.7.2
     - 3.8.6
-    - 3.9.1    
+    - 3.9.1
     - 4.2.0
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index daa7bf0..2aee896 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
 FROM alpine:3.14
 
-MAINTAINER Hanjo Meinhardt <hanjo@bunix.de>
+LABEL org.opencontainers.image.authors="hanjo@bunix.de"
 
 ENV dev_packages="ca-certificates build-base libffi-dev ruby-dev ruby-rdoc ruby-irb gcc make musl-dev"
 
-RUN apk update && apk upgrade \
-    && apk add ruby ruby-json libffi libstdc++ ${dev_packages} \
+RUN apk add --no-cache ruby ruby-json libffi libstdc++ ${dev_packages} \
     && rm -rf /var/cache/apk/*
 
-RUN gem install jekyll -v <VERSION> \
+ARG JEKYLL_VERSION
+RUN gem install jekyll -v ${JEKYLL_VERSION} \
     && gem install jekyll-paginate \
     && gem install jekyll-auto-image \
     && gem install jekyll-tidy \
     && gem install jekyll-sitemap \
-    && gem install bigdecimal 
+    && gem install bigdecimal
 
 RUN apk del ${dev_packages}