From 71558da497bd3941999df3240ee5bb83cb9cd317 Mon Sep 17 00:00:00 2001
From: "Ben Sheldon [he/him]" <bensheldon@gmail.com>
Date: Wed, 24 Jan 2024 13:09:00 -0800
Subject: [PATCH] Fix Docker build args for CI matrix; remove Ruby 1.9 tests

---
 .github/workflows/ci.yml | 7 ++-----
 Dockerfile               | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bae5aba8..c583649b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,14 +17,11 @@ jobs:
       matrix:
         mysql: ["5.7", "8"]
         distribution: ["debian:buster", "ubuntu:focal", "ubuntu:bionic"]
-        ruby: ["3.2"]
+        ruby: ["3.3"]
         include:
           - mysql: "5.7"
             distribution: "debian:buster"
-            ruby: "1.9"
-          - mysql: "5.7"
-            distribution: "debian:buster"
-            ruby: "2.8"
+            ruby: "2.7.8"
     steps:
     - uses: actions/checkout@v4
     - name: docker login
diff --git a/Dockerfile b/Dockerfile
index c1d45ed2..91538556 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 ARG DISTRIBUTION=ubuntu:jammy
-ARG RUBY_VERSION=3.2
 FROM ${DISTRIBUTION}
 LABEL maintainer="github@github.com"
 
@@ -10,9 +9,10 @@ RUN update-ca-certificates
 RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.0/ruby-install-0.9.0.tar.gz && \
     tar -xzvf ruby-install-0.9.0.tar.gz && \
     cd ruby-install-0.9.0/ && \
-    make install && \
-    ruby-install --system ruby ${RUBY_VERSION}
+    make install
 
+ARG RUBY_VERSION=3.2
+RUN ruby-install --system ruby ${RUBY_VERSION}
 RUN ruby --version
 
 WORKDIR /app