Skip to content

Commit

Permalink
chore: bump preconfigured Ruby versions 3.2.5 -> 3.2.6; 3.3.5 -> 3.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Jan 4, 2025
1 parent d29f8f4 commit e6a8368
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ jobs:
- 'ubuntu-20.04'
- 'alpine-3.17'
package_ruby_ver:
- '3.2.5'
- '3.3.5'
- '3.2.6'
- '3.3.6'
container:
image: ghcr.io/tamatebako/tebako-${{ matrix.container }}:latest

Expand Down Expand Up @@ -143,8 +143,8 @@ jobs:
- 'ubuntu-20.04'
- 'alpine-3.17'
package_ruby_ver:
- '3.2.5'
- '3.3.5'
- '3.2.6'
- '3.3.6'

steps:
- name: Checkout fontist
Expand Down
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ This container is based on Alpine Linux 3.17 (`musl`), offering a smaller image
size. Suitable for those who prefer a minimalistic approach.

Both containers are tailored for Tebako packaging, featuring preinstalled Ruby
environments versions 3.2.5 and 3.3.5.
environments versions 3.2.6 and 3.3.6.


== Using the Tebako containers
Expand Down Expand Up @@ -84,7 +84,7 @@ directory, can be packaged into `./fontist-package` using the following command.
----
docker run -v $PWD:/mnt/w \
-t ghcr.io/tamatebako/tebako-ubuntu-20.04:latest \
tebako press --root=/mnt/w/fontist --entry-point=fontist --output=/mnt/w/fontist-package --Ruby=3.2.5
tebako press --root=/mnt/w/fontist --entry-point=fontist --output=/mnt/w/fontist-package --Ruby=3.2.6
----
====

Expand Down Expand Up @@ -131,7 +131,7 @@ directory, can be packaged into `./fontist-package` using the following command.
$ docker run -it --rm -v $PWD:/mnt/w ghcr.io/tamatebako/tebako-<container_tag>:latest bash
# Run this after entering the container
$ tebako press --root=/mnt/w/fontist --entry-point=fontist --output=/mnt/w/fontist-package --Ruby=3.2.5
$ tebako press --root=/mnt/w/fontist --entry-point=fontist --output=/mnt/w/fontist-package --Ruby=3.2.6
----
====

Expand Down
10 changes: 5 additions & 5 deletions alpine-3.17.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ ENV CXX=clang++
ENV TEBAKO_PREFIX=/root/.tebako
COPY test /root/test

# Create packaging environment for Ruby 3.3.5, 3.2.5
# Create packaging environment for Ruby 3.3.6, 3.2.6
# Test and "warm up" since initialization is fully finished after the first packaging
RUN gem install tebako && \
tebako setup -R 3.3.5 && \
tebako setup -R 3.2.5 && \
tebako press -R 3.3.5 -r /root/test -e tebako-test-run.rb -o ruby-3.3.5-package && \
tebako press -R 3.2.5 -r /root/test -e tebako-test-run.rb -o ruby-3.2.5-package && \
tebako setup -R 3.3.6 && \
tebako setup -R 3.2.6 && \
tebako press -R 3.3.6 -r /root/test -e tebako-test-run.rb -o ruby-3.3.6-package && \
tebako press -R 3.2.6 -r /root/test -e tebako-test-run.rb -o ruby-3.2.6-package && \
rm ruby-*-package

ENV PS1="\[\]\[\e]0;\u@\h: \w\a\]\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ \[\]"
Expand Down
10 changes: 5 additions & 5 deletions ubuntu-20.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ RUN /opt/tools/tools.sh install_cmake && \
ENV TEBAKO_PREFIX=/root/.tebako
COPY test /root/test

# Create packaging environment for Ruby 3.3.5, 3.2.5
# Create packaging environment for Ruby 3.3.6, 3.2.6
# Test and "warm up" since initialization is fully finished after the first packaging
RUN gem install tebako && \
tebako setup -R 3.3.5 && \
tebako setup -R 3.2.5 && \
tebako press -R 3.3.5 -r /root/test -e tebako-test-run.rb -o ruby-3.3.5-package && \
tebako press -R 3.2.5 -r /root/test -e tebako-test-run.rb -o ruby-3.2.5-package && \
tebako setup -R 3.3.6 && \
tebako setup -R 3.2.6 && \
tebako press -R 3.3.6 -r /root/test -e tebako-test-run.rb -o ruby-3.3.6-package && \
tebako press -R 3.2.6 -r /root/test -e tebako-test-run.rb -o ruby-3.2.6-package && \
rm ruby-*-package

ENV PS1="\[\]\[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ \[\]"
Expand Down

0 comments on commit e6a8368

Please sign in to comment.