.woodpecker.yml

@@ -1,31 +1,39 @@
 pipeline:
   publish:
     image: plugins/docker
-    settings:
-      registry: registry.nulo.in
-      repo: registry.nulo.in/sutty/geminabox
-      tags:
-      - ${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
-      - latest
-      build_args:
-      - RUBY_VERSION=${RUBY_VERSION}
-      - RUBY_PATCH=${RUBY_PATCH}
-      - NIO4R_VERSION=${NIO4R_VERSION}
-      - PUMA_VERSION=${PUMA_VERSION}
-      - HIREDIS_VERSION=${HIREDIS_VERSION}
-      - ALPINE_VERSION=${ALPINE_VERSION}
-      - BASE_IMAGE=registry.nulo.in/sutty/ruby
-      username: sutty
+    registry: registry.nulo.in
+    repo: registry.nulo.in/sutty/geminabox
+    tags:
+    - ${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}
+    - latest
+    build_args:
+    - RUBY_VERSION=${RUBY_VERSION}
+    - RUBY_PATCH=${RUBY_PATCH}
+    - NIO4R_VERSION=${NIO4R_VERSION}
+    - PUMA_VERSION=${PUMA_VERSION}
+    - HIREDIS_VERSION=${HIREDIS_VERSION}
+    - ALPINE_VERSION=${ALPINE_VERSION}
+    - BASE_IMAGE=registry.nulo.in/sutty/ruby
+    username: sutty
     secrets:
     - docker_password
     when:
       branch: antifascista
       event: push
 matrix:
+  NIO4R_VERSION: 2.5.8
+  PUMA_VERSION: 5.6.2
+  HIREDIS_VERSION: 0.6.3
   include:
   - ALPINE_VERSION: 3.13.6
     RUBY_VERSION: 2.7
     RUBY_PATCH: 5
-    NIO4R_VERSION: 2.5.8
-    PUMA_VERSION: 5.6.2
-    HIREDIS_VERSION: 0.6.3
+  - ALPINE_VERSION: 3.13.7
+    RUBY_VERSION: 2.7
+    RUBY_PATCH: 5
+  - ALPINE_VERSION: 3.14.3
+    RUBY_VERSION: 2.7
+    RUBY_PATCH: 5
+  - ALPINE_VERSION: 3.15.0
+    RUBY_VERSION: 3.0
+    RUBY_PATCH: 3

config.ru

@@ -5,8 +5,6 @@ require 'securerandom'
 Geminabox.data = '/srv/gems'
 Geminabox.rubygems_proxy = true
 Geminabox.allow_remote_failure = true
-Geminabox.build_legacy = false
-Geminabox.rubygems_proxy_merge_strategy = :combine_local_and_remote_gem_versions
 
 # https://github.com/geminabox/geminabox/wiki/Http-Basic-Auth
 Geminabox::Server.helpers do

geminabox.sh

@@ -15,9 +15,9 @@ chown -R ruby:www-data ${dir}
 case $1 in
   start)
     rm -f ${pid}
-    daemonize -p ${pid} -l ${pid} -c ${dir} -u ruby /usr/bin/bundle exec rackup -o :: -p 9292
+    daemonize -p ${pid} -l ${pid} -c ${dir} -u ruby /usr/bin/bundle exec rackup
     ;;
-  stop)
+  start)
     test ! -f ${pid} || cat ${pid} | xargs -r kill
     rm -f ${pid}
     ;;