Rename and reorganize Ruby build stages

Author: hsbt

.github/workflows/build.yml

@@ -13,10 +13,10 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - ruby-0.x-2.0
-          - ruby-1.2-1.6
+          - ruby-0.x-1.6
           - ruby-1.8.6-1.8.7
           - ruby-1.9
+          - ruby-2.0
           - ruby-2.1
           - ruby-2.2
           - ruby-2.3

Dockerfile

@@ -41,22 +41,21 @@ COPY patch /all-ruby/patch/
 RUN rake setup_build
 
 # =============================================================================
-# Ruby 0.x-2.0.0 on Debian Buster
+# Ruby 0.x-1.6 on Debian Buster (needs i386 for 32-bit builds)
 # =============================================================================
-FROM builder-buster AS ruby-0.x-2.0
+FROM builder-buster AS ruby-0.x-1.6
 ARG j=numcpu_plus_alpha
 
-COPY versions/0.* versions/1.0* versions/1.1* versions/1.8.0* versions/1.8.1* versions/1.8.2* versions/1.8.3* versions/1.8.4* versions/1.8.5* versions/2.0.0* /all-ruby/versions/
-RUN rake -j ${j} all-0 all-1.0 all-1.1a all-1.1b all-1.1c all-1.1d all-1.8 all-1.8.5
-RUN rake -j ${j} all-2.0.0
+COPY versions/0.* versions/1.0* versions/1.1* versions/1.2* versions/1.3* versions/1.4* versions/1.6* versions/1.8.0* versions/1.8.1* versions/1.8.2* versions/1.8.3* versions/1.8.4* versions/1.8.5* /all-ruby/versions/
+RUN rake -j ${j} all-0 all-1.0 all-1.1a all-1.1b all-1.1c all-1.1d all-1.2 all-1.3 all-1.4 all-1.6 all-1.8 all-1.8.5
 
 RUN rm -rf Rakefile versions/ patch/ DIST build/*/log build/*/ruby*/ \
       build/*/man build/*/share/man build/*/share/doc build/*/share/ri && \
     rm -f build/*/lib/libruby-static.a build/*/bin/gcc build/*/bin/cc
 RUN find /build-all-ruby -type f \( -name ruby -o -name '*.so' \) -exec sh -c 'file $1 | grep -q "not stripped"' - '{}' \; -print0 | xargs -0 strip
 
 # =============================================================================
-# Base build environment: Debian Bullseye (for Ruby 1.2-3.0)
+# Base build environment: Debian Bullseye (for Ruby 1.8.6-3.0)
 # =============================================================================
 FROM debian:bullseye-slim AS builder-bullseye
 ENV DEBIAN_FRONTEND=noninteractive
@@ -83,42 +82,42 @@ COPY patch /all-ruby/patch/
 RUN rake setup_build
 
 # =============================================================================
-# Ruby 1.2-1.6 on Debian Buster (needs i386 for 32-bit builds)
+# Ruby 1.8.6-1.8.7
 # =============================================================================
-FROM builder-buster AS ruby-1.2-1.6
+FROM builder-bullseye AS ruby-1.8.6-1.8.7
 ARG j=numcpu_plus_alpha
 
-COPY versions/1.2* versions/1.3* versions/1.4* versions/1.6* /all-ruby/versions/
-RUN rake -j ${j} all-1.2 all-1.3 all-1.4 all-1.6
+COPY versions/1.8.6* versions/1.8.7* /all-ruby/versions/
+RUN rake -j ${j} all-1.8.6 all-1.8.7
 
 RUN rm -rf Rakefile versions/ patch/ DIST build/*/log build/*/ruby*/ \
       build/*/man build/*/share/man build/*/share/doc build/*/share/ri && \
     rm -f build/*/lib/libruby-static.a build/*/bin/gcc build/*/bin/cc
 RUN find /build-all-ruby -type f \( -name ruby -o -name '*.so' \) -exec sh -c 'file $1 | grep -q "not stripped"' - '{}' \; -print0 | xargs -0 strip
 
 # =============================================================================
-# Ruby 1.8.6-1.8.7
+# Ruby 1.9.x
 # =============================================================================
-FROM builder-bullseye AS ruby-1.8.6-1.8.7
+FROM builder-bullseye AS ruby-1.9
 ARG j=numcpu_plus_alpha
 
-COPY versions/1.8.6* versions/1.8.7* /all-ruby/versions/
-RUN rake -j ${j} all-1.8.6 all-1.8.7
+COPY versions/1.9* /all-ruby/versions/
+RUN rake -j ${j} all-1.9.0 all-1.9.1 all-1.9.2
+RUN rake -j ${j} all-1.9.3
 
 RUN rm -rf Rakefile versions/ patch/ DIST build/*/log build/*/ruby*/ \
       build/*/man build/*/share/man build/*/share/doc build/*/share/ri && \
     rm -f build/*/lib/libruby-static.a build/*/bin/gcc build/*/bin/cc
 RUN find /build-all-ruby -type f \( -name ruby -o -name '*.so' \) -exec sh -c 'file $1 | grep -q "not stripped"' - '{}' \; -print0 | xargs -0 strip
 
 # =============================================================================
-# Ruby 1.9.x
+# Ruby 2.0
 # =============================================================================
-FROM builder-bullseye AS ruby-1.9
+FROM builder-bullseye AS ruby-2.0
 ARG j=numcpu_plus_alpha
 
-COPY versions/1.9* /all-ruby/versions/
-RUN rake -j ${j} all-1.9.0 all-1.9.1 all-1.9.2
-RUN rake -j ${j} all-1.9.3
+COPY versions/2.0.0* /all-ruby/versions/
+RUN rake -j ${j} all-2.0.0
 
 RUN rm -rf Rakefile versions/ patch/ DIST build/*/log build/*/ruby*/ \
       build/*/man build/*/share/man build/*/share/doc build/*/share/ri && \

Dockerfile.final

@@ -9,19 +9,19 @@ ARG system_ruby=ruby3.1
 # =============================================================================
 FROM ${os}:${version}${variant} AS ruby-0.x-2.4
 
-COPY --from=docker.io/rubylang/all-ruby:ruby-0.x-2.0 /build-all-ruby/ /build-all-ruby/
-COPY --from=docker.io/rubylang/all-ruby:ruby-1.2-1.6 /build-all-ruby/ /build-all-ruby/
+COPY --from=docker.io/rubylang/all-ruby:ruby-0.x-1.6 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-1.8.6-1.8.7 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-1.9 /build-all-ruby/ /build-all-ruby/
+COPY --from=docker.io/rubylang/all-ruby:ruby-2.0 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.1 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.2 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.3 /build-all-ruby/ /build-all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.4 /build-all-ruby/ /build-all-ruby/
 
-COPY --from=docker.io/rubylang/all-ruby:ruby-0.x-2.0 /all-ruby/ /all-ruby/
-COPY --from=docker.io/rubylang/all-ruby:ruby-1.2-1.6 /all-ruby/bin/ /all-ruby/bin/
+COPY --from=docker.io/rubylang/all-ruby:ruby-0.x-1.6 /all-ruby/ /all-ruby/
 COPY --from=docker.io/rubylang/all-ruby:ruby-1.8.6-1.8.7 /all-ruby/bin/ /all-ruby/bin/
 COPY --from=docker.io/rubylang/all-ruby:ruby-1.9 /all-ruby/bin/ /all-ruby/bin/
+COPY --from=docker.io/rubylang/all-ruby:ruby-2.0 /all-ruby/bin/ /all-ruby/bin/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.1 /all-ruby/bin/ /all-ruby/bin/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.2 /all-ruby/bin/ /all-ruby/bin/
 COPY --from=docker.io/rubylang/all-ruby:ruby-2.3 /all-ruby/bin/ /all-ruby/bin/
@@ -114,7 +114,7 @@ COPY --from=docker.io/rubylang/all-ruby:ruby-2.5-3.1 /all-ruby/bin/ /all-ruby/bi
 COPY --from=docker.io/rubylang/all-ruby:ruby-3.2-4.0 /all-ruby/bin/ /all-ruby/bin/
 
 # for Ruby 0.x and 1.1x (built on buster, need libcrypt.so.1)
-COPY --from=docker.io/rubylang/all-ruby:ruby-1.2-1.6 /lib/i386-linux-gnu/libcrypt.so.1.1.0 /lib/i386-linux-gnu/libcrypt.so.1.1.0
+COPY --from=docker.io/rubylang/all-ruby:ruby-0.x-1.6 /lib/i386-linux-gnu/libcrypt.so.1.1.0 /lib/i386-linux-gnu/libcrypt.so.1.1.0
 RUN cd /lib/i386-linux-gnu && ln -s libcrypt.so.1.1.0 libcrypt.so.1
 
 # for Ruby 2.4-3.0 (built on bullseye, need libssl1.1/libcrypto1.1)