Skip to content

Commit cd89433

Browse files
author
Max Erkin
committed
Build Ruby on Debian 13 (trixie)
1 parent 5799055 commit cd89433

File tree

3 files changed

+89
-31
lines changed

3 files changed

+89
-31
lines changed

.github/workflows/build-push.yml

Lines changed: 77 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,64 @@ jobs:
1717
matrix:
1818
include:
1919

20+
# 3.4.5 on Debian 13
21+
- ruby-version: "3.4.5"
22+
ruby-variant: "jemalloc"
23+
debian-image: "trixie"
24+
debian-version: "13"
25+
aliases: |
26+
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc
27+
quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc
28+
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-trixie
29+
- ruby-version: "3.4.5"
30+
ruby-variant: "jemalloc"
31+
debian-image: "trixie-slim"
32+
debian-version: "13"
33+
aliases: |
34+
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-slim
35+
quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-slim
36+
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-trixie-slim
37+
- ruby-version: "3.4.5"
38+
ruby-variant: "malloctrim"
39+
debian-image: "trixie"
40+
debian-version: "13"
41+
aliases: |
42+
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim
43+
quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim
44+
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-trixie
45+
- ruby-version: "3.4.5"
46+
ruby-variant: "malloctrim"
47+
debian-image: "trixie-slim"
48+
debian-version: "13"
49+
aliases: |
50+
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-slim
51+
quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-slim
52+
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-trixie-slim
53+
2054
# 3.4.5 on Debian 12
2155
- ruby-version: "3.4.5"
2256
ruby-variant: "jemalloc"
2357
debian-image: "bookworm"
2458
debian-version: "12"
2559
aliases: |
26-
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc
27-
quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc
2860
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-bookworm
2961
- ruby-version: "3.4.5"
3062
ruby-variant: "jemalloc"
3163
debian-image: "bookworm-slim"
3264
debian-version: "12"
3365
aliases: |
34-
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-slim
35-
quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-slim
3666
quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-bookworm-slim
3767
- ruby-version: "3.4.5"
3868
ruby-variant: "malloctrim"
3969
debian-image: "bookworm"
4070
debian-version: "12"
4171
aliases: |
42-
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim
43-
quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim
4472
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-bookworm
4573
- ruby-version: "3.4.5"
4674
ruby-variant: "malloctrim"
4775
debian-image: "bookworm-slim"
4876
debian-version: "12"
4977
aliases: |
50-
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-slim
51-
quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-slim
5278
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-bookworm-slim
5379
5480
# 3.4.5 on Debian 11
@@ -77,38 +103,64 @@ jobs:
77103
aliases: |
78104
quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-bullseye-slim
79105
106+
# 3.3.8 on Debian 13
107+
- ruby-version: "3.3.8"
108+
ruby-variant: "jemalloc"
109+
debian-image: "trixie"
110+
debian-version: "13"
111+
aliases: |
112+
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc
113+
quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc
114+
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-trixie
115+
- ruby-version: "3.3.8"
116+
ruby-variant: "jemalloc"
117+
debian-image: "trixie-slim"
118+
debian-version: "13"
119+
aliases: |
120+
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-slim
121+
quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-slim
122+
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-trixie-slim
123+
- ruby-version: "3.3.8"
124+
ruby-variant: "malloctrim"
125+
debian-image: "trixie"
126+
debian-version: "13"
127+
aliases: |
128+
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim
129+
quay.io/evl.ms/fullstaq-ruby:3.3.8-malloctrim
130+
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-trixie
131+
- ruby-version: "3.3.8"
132+
ruby-variant: "malloctrim"
133+
debian-image: "trixie-slim"
134+
debian-version: "13"
135+
aliases: |
136+
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-slim
137+
quay.io/evl.ms/fullstaq-ruby:3.3.8-malloctrim-slim
138+
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-trixie-slim
139+
80140
# 3.3.8 on Debian 12
81141
- ruby-version: "3.3.8"
82142
ruby-variant: "jemalloc"
83143
debian-image: "bookworm"
84144
debian-version: "12"
85145
aliases: |
86-
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc
87-
quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc
88146
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-bookworm
89147
- ruby-version: "3.3.8"
90148
ruby-variant: "jemalloc"
91149
debian-image: "bookworm-slim"
92150
debian-version: "12"
93151
aliases: |
94-
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-slim
95-
quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-slim
96152
quay.io/evl.ms/fullstaq-ruby:3.3-jemalloc-bookworm-slim
97153
- ruby-version: "3.3.8"
98154
ruby-variant: "malloctrim"
99155
debian-image: "bookworm"
100156
debian-version: "12"
101157
aliases: |
102-
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim
103-
quay.io/evl.ms/fullstaq-ruby:3.3.8-malloctrim
104158
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-bookworm
105159
- ruby-version: "3.3.8"
106160
ruby-variant: "malloctrim"
107161
debian-image: "bookworm-slim"
108162
debian-version: "12"
109163
aliases: |
110-
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-slim
111-
quay.io/evl.ms/fullstaq-ruby:3.3.8-malloctrim-slim
112164
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-bookworm-slim
113165
114166
# 3.3.8 on Debian 11
@@ -137,30 +189,35 @@ jobs:
137189
aliases: |
138190
quay.io/evl.ms/fullstaq-ruby:3.3-malloctrim-bullseye-slim
139191
192+
140193
# 3.2.8 on Debian 12
141194
- ruby-version: "3.2.8"
142195
ruby-variant: "jemalloc"
143196
debian-image: "bookworm"
144197
debian-version: "12"
145198
aliases: |
199+
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc
146200
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-bookworm
147201
- ruby-version: "3.2.8"
148202
ruby-variant: "jemalloc"
149203
debian-image: "bookworm-slim"
150204
debian-version: "12"
151205
aliases: |
206+
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-slim
152207
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-bookworm-slim
153208
- ruby-version: "3.2.8"
154209
ruby-variant: "malloctrim"
155210
debian-image: "bookworm"
156211
debian-version: "12"
157212
aliases: |
213+
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim
158214
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-bookworm
159215
- ruby-version: "3.2.8"
160216
ruby-variant: "malloctrim"
161217
debian-image: "bookworm-slim"
162218
debian-version: "12"
163219
aliases: |
220+
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-slim
164221
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-bookworm-slim
165222
166223
# 3.2.8 on Debian 11
@@ -169,29 +226,25 @@ jobs:
169226
debian-image: "bullseye"
170227
debian-version: "11"
171228
aliases: |
172-
quay.io/evl.ms/fullstaq-ruby:3.2.8-jemalloc
173-
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc
229+
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-bullseye
174230
- ruby-version: "3.2.8"
175231
ruby-variant: "jemalloc"
176232
debian-image: "bullseye-slim"
177233
debian-version: "11"
178234
aliases: |
179-
quay.io/evl.ms/fullstaq-ruby:3.2.8-jemalloc-slim
180-
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-slim
235+
quay.io/evl.ms/fullstaq-ruby:3.2-jemalloc-slim-bullseye
181236
- ruby-version: "3.2.8"
182237
ruby-variant: "malloctrim"
183238
debian-image: "bullseye"
184239
debian-version: "11"
185240
aliases: |
186-
quay.io/evl.ms/fullstaq-ruby:3.2.8-malloctrim
187-
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim
241+
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-bullseye
188242
- ruby-version: "3.2.8"
189243
ruby-variant: "malloctrim"
190244
debian-image: "bullseye-slim"
191245
debian-version: "11"
192246
aliases: |
193-
quay.io/evl.ms/fullstaq-ruby:3.2.8-malloctrim-slim
194-
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-slim
247+
quay.io/evl.ms/fullstaq-ruby:3.2-malloctrim-slim-bullseye
195248
196249
# 3.1.7 on Debian 11
197250
- ruby-version: "3.1.7"

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ RUN apt-get update -q \
1515
gnupg \
1616
apt-transport-https \
1717
ca-certificates \
18-
&& curl -SLf https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc | apt-key add - \
18+
gpg \
19+
&& curl -SLf https://raw.githubusercontent.com/fullstaq-labs/fullstaq-ruby-server-edition/main/fullstaq-ruby.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/fullstaq-ruby.gpg \
1920
&& echo "deb https://apt.fullstaqruby.org debian-${DEBIAN_VERSION} main" > /etc/apt/sources.list.d/fullstaq-ruby.list \
2021
&& apt-get update -q \
2122
&& apt-get install --assume-yes -q --no-install-recommends fullstaq-ruby-${RUBY_VERSION}-${RUBY_VARIANT} \

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-slim
2626

2727
## Flavors
2828

29-
Ruby 3.4.5, 3.3.8, 3.2.8 and 3.1.7 with jemalloc and malloctrim are available. Images are built on top of Debian 11 (bullseye), also Ruby 3.2 and newer are build on top of Debian 12 (bookworm):
29+
Ruby 3.4.5, 3.3.8, 3.2.8 and 3.1.7 with jemalloc and malloctrim are available. Images are built on top of Debian 11 (bullseye), 12 (bookworm), also Ruby 3.2 and newer are build on top of Debian 12 (bookworm):
3030

3131
```sh
3232
# 3.4:
33+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-trixie-slim
34+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-trixie
3335
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-bookworm-slim
3436
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-bookworm
3537
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-bullseye-slim
@@ -40,6 +42,8 @@ docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-bullseye-slim
4042
docker pull quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-bullseye
4143

4244
# 3.3:
45+
docker pull quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-trixie-slim
46+
docker pull quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-trixie
4347
docker pull quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-bookworm-slim
4448
docker pull quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-bookworm
4549
docker pull quay.io/evl.ms/fullstaq-ruby:3.3.8-jemalloc-bullseye-slim
@@ -66,13 +70,13 @@ docker pull quay.io/evl.ms/fullstaq-ruby:3.1.7-malloctrim-bullseye-slim
6670
docker pull quay.io/evl.ms/fullstaq-ruby:3.1.7-malloctrim-bullseye
6771
```
6872

69-
Latest patch versions for Ruby 3.4 on Debian 12 (bookworm) are also aliased with shortened tags including major and minor versions only: `3.4.5-jemalloc-bookworm → 3.4-jemalloc`
73+
Latest patch versions for Ruby 3.4 on Debian 13 (trixie) are also aliased with shortened tags including major and minor versions only: `3.4.5-jemalloc-trixie → 3.4-jemalloc`
7074

7175
```sh
72-
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-slim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-bookworm-slim
73-
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-bookworm
74-
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-slim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-bookworm-slim
75-
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-bookworm
76+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc-slim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-trixie-slim
77+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-jemalloc # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-jemalloc-trixie
78+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim-slim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-trixie-slim
79+
docker pull quay.io/evl.ms/fullstaq-ruby:3.4-malloctrim # Same as quay.io/evl.ms/fullstaq-ruby:3.4.5-malloctrim-trixie
7680
```
7781

7882
For Ruby 3.2 and 3.1, short aliases for latest patch versions are made against Debian 11 (bullseye): `3.2.8-jemalloc-bullseye → 3.2-jemalloc`

0 commit comments

Comments
 (0)