From 5694d1b1b45b55c0a4046f10460703b83545bd97 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 4 Jun 2022 15:27:25 -0300
Subject: [PATCH] support multiple ruby versions

---
 .woodpecker.yml | 25 +++++++++++++++++++------
 Dockerfile      | 11 +++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 29206a8..79fed7a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,10 +7,12 @@ pipeline:
       repo: registry.nulo.in/sutty/containers-gem-compiler
       cache_from: registry.nulo.in/sutty/containers-gem-compiler
       tags:
-      - ${ALPINE_VERSION}
+      - ${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
       - latest
       build_args:
       - ALPINE_VERSION=${ALPINE_VERSION}
+      - RUBY_VERSION=${RUBY_VERSION}
+      - RUBY_PATCH=${RUBY_PATCH}
       - BASE_IMAGE=registry.nulo.in/sutty/containers-sdk-ruby
     secrets:
     - docker_password
@@ -18,8 +20,19 @@ pipeline:
       branch: antifascista
       event: push
 matrix:
-  ALPINE_VERSION:
-  - 3.16.0
-  - 3.15.4
-  - 3.14.6
-  - 3.13.10
+  include:
+  - ALPINE_VERSION: 3.16.0
+    RUBY_VERSION: 3.1
+    RUBY_PATCH: 2
+  - ALPINE_VERSION: 3.15.4
+    RUBY_VERSION: 3.0
+    RUBY_PATCH: 4
+  - ALPINE_VERSION: 3.14.6
+    RUBY_VERSION: 2.7
+    RUBY_PATCH: 6
+  - ALPINE_VERSION: 3.13.10
+    RUBY_VERSION: 2.7
+    RUBY_PATCH: 6
+  - ALPINE_VERSION: 3.13.6
+    RUBY_VERSION: 2.7
+    RUBY_PATCH: 6
diff --git a/Dockerfile b/Dockerfile
index 9bc9121..4e59020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,8 @@
-ARG  ALPINE_VERSION=3.13.6
-ARG  BASE_IMAGE=sutty/sdk-ruby
-FROM ${BASE_IMAGE}:${ALPINE_VERSION}
+ARG RUBY_VERSION=2.7
+ARG RUBY_PATCH=6
+ARG ALPINE_VERSION=3.13.6
+ARG BASE_IMAGE=sutty/sdk-ruby
+FROM ${BASE_IMAGE}:${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
 MAINTAINER "f <f@sutty.nl>"
 
 ENV PLATFORM=x86_64-linux-musl
@@ -12,9 +14,6 @@ ENV HTTP_BASIC_PASSWORD=gibberish
 ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1
 ENV EXTRA_PKGS=''
 
-RUN id
-RUN gem env
-RUN ls -hal /usr/lib/ruby/gems/2.7.0
 RUN gem install --no-user-install --no-document --source https://rubygems.org geminabox gem-compiler
 
 COPY ./gem-compiler.sh /usr/local/bin/gem-compiler