Merge pull request #279 from OpenVoxProject/fix-build-use-ruby-image

Use Ruby 4 for builder image and cache it

Author: nmburgan

.github/workflows/main.yml

@@ -135,8 +135,26 @@ jobs:
       - name: setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: '4.0'
           bundler-cache: true
+      - id: docker-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: /tmp/ezbake-builder.tar
+          key: docker-ezbake-${{ hashFiles('Dockerfile') }}
+      - name: load or build docker image
+        run: |
+          if [[ -f /tmp/ezbake-builder.tar ]]; then
+            docker load -i /tmp/ezbake-builder.tar
+          else
+            docker build -t ezbake-builder .
+            docker save ezbake-builder -o /tmp/ezbake-builder.tar
+          fi
+      - uses: actions/cache/save@v4
+        if: always() && steps.docker-cache.outputs.cache-hit != 'true'
+        with:
+          path: /tmp/ezbake-builder.tar
+          key: docker-ezbake-${{ hashFiles('Dockerfile') }}
       - name: build it
         run: bundle exec rake vox:build
       - name: get version

Dockerfile

@@ -1,16 +1,16 @@
-FROM almalinux:9
+FROM ruby:4.0-bookworm
 
-WORKDIR /
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      openjdk-17-jdk-headless \
+      rpm \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN dnf install -y --enablerepo=crb vim wget git rpm-build java-17-openjdk java-17-openjdk-devel libyaml-devel zlib zlib-devel gcc-c++ patch readline readline-devel libffi-devel openssl-devel make bzip2 autoconf automake libtool bison sqlite-devel
-RUN wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
-RUN chmod a+x lein
-RUN mv lein /usr/local/bin
-RUN wget -q https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer -O- | bash
-RUN /bin/bash --login -c 'rbenv install 3.2.9'
-RUN /bin/bash --login -c 'rbenv global 3.2.9'
-RUN git config --global user.email "openvox@voxpupuli.org"
-RUN git config --global user.name "Vox Pupuli"
-RUN git config --global --add safe.directory /code
+RUN wget -q https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein -O /usr/local/bin/lein && \
+    chmod a+x /usr/local/bin/lein
 
-CMD ["tail -f /dev/null"]
+RUN git config --global user.email "openvox@voxpupuli.org" && \
+    git config --global user.name "Vox Pupuli" && \
+    git config --global --add safe.directory /code
+
+CMD ["tail", "-f", "/dev/null"]

Gemfile

@@ -23,6 +23,7 @@ def location_for(place)
 end
 
 gem 'openfact'
+gem 'ostruct'
 gem 'rake'
 gem 'packaging', '~> 1.0', github: 'OpenVoxProject/packaging'
 

project.clj

@@ -110,7 +110,7 @@
 
   :url "https://github.com/openvoxproject/openvoxdb/"
 
-  :min-lein-version "2.7.1"
+  :min-lein-version "2.12.0"
 
   ;; Abort when version ranges or version conflicts are detected in
   ;; dependencies. Also supports :warn to simply emit warnings.
@@ -371,7 +371,7 @@
                                       ;; via the release_scripts/sync_ezbake_dep.rb script.
                                       [org.openvoxproject/puppetdb "9.0.0-SNAPSHOT"]]
               :name "puppetdb"
-              :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.4")]]}
+              :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.6")]]}
     :ezbake-fips {:dependencies ^:replace [[org.bouncycastle/bcpkix-fips]
                                            [org.bouncycastle/bc-fips]
                                            [org.bouncycastle/bctls-fips]
@@ -381,7 +381,7 @@
                                            [org.openvoxproject/puppetdb "9.0.0-SNAPSHOT"]]
               :name "puppetdb"
               :uberjar-exclusions [#"^org/bouncycastle/.*"]
-              :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.4")]]}
+              :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.6")]]}
     :testutils {:source-paths ^:replace ["test"]
                 :resource-paths ^:replace []
                 ;; Something else may need adjustment, but

rakelib/build.rake

@@ -164,7 +164,7 @@ module Vox
       ezbake_version_var = ENV['EZBAKE_VERSION'] ? "EZBAKE_VERSION=#{ENV['EZBAKE_VERSION']}" : ""
 
       puts 'Building openvoxdb'
-      @runner.exec('cd /code && rm -rf ruby output && bundle install --without test && lein install')
+      @runner.exec('cd /code && rm -rf ruby output && bundle config set without test && bundle install && lein install')
 
       unless @debs.empty? && @nonfips_rpms.empty?
         @runner.exec(