Skip to content

Commit 98b3dcb

Browse files
committed
fix: update ruby into dockerfile that dependabot can update
1 parent a409591 commit 98b3dcb

File tree

7 files changed

+29
-35
lines changed

7 files changed

+29
-35
lines changed

.buildkite/Dockerfile-ruby

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM ruby:3.4.9@sha256:31c10c1f4344d11e5b2353759567990d40b7f85f5487a9520c695c3500ef7f60

.buildkite/docker-compose.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ services:
4747
- CI_E2E_TESTS_AGENT_TOKEN
4848

4949
ruby:
50-
image: ruby:2.7.6
50+
build:
51+
context: .
52+
dockerfile: Dockerfile-ruby
5153
volumes:
5254
- ..:/work
53-
- ruby-2-7-6-agent-gem-cache:/usr/local/bundle
55+
- ruby-agent-gem-cache:/usr/local/bundle
5456
working_dir: /work
5557
command: /bin/bash
5658
environment:
@@ -59,4 +61,4 @@ services:
5961
- BUILD_VERSION
6062

6163
volumes:
62-
ruby-2-7-6-agent-gem-cache: ~
64+
ruby-agent-gem-cache: ~

.buildkite/steps/publish-debian-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mkdir -p deb
4545
buildkite-agent artifact download --build "$artifacts_build" "deb/*.deb" deb/
4646

4747
echo '--- Installing dependencies'
48-
bundle
48+
bundle install
4949

5050
# Loop over all the .deb files and publish them
5151
for file in deb/*.deb; do

.mise.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[tools]
22
go = "1.25.9"
33
golangci-lint = "2.9.0"
4+
ruby = "3.4.9"

Gemfile.lock

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,57 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.9.0)
5-
public_suffix (>= 2.0.2, < 8.0)
64
arr-pm (0.0.12)
75
aws-eventstream (1.4.0)
8-
aws-partitions (1.1213.0)
9-
aws-sdk-core (3.242.0)
6+
aws-partitions (1.1237.0)
7+
aws-sdk-core (3.244.0)
108
aws-eventstream (~> 1, >= 1.3.0)
119
aws-partitions (~> 1, >= 1.992.0)
1210
aws-sigv4 (~> 1.9)
1311
base64
1412
bigdecimal
1513
jmespath (~> 1, >= 1.6.1)
1614
logger
17-
aws-sdk-kms (1.121.0)
18-
aws-sdk-core (~> 3, >= 3.241.4)
15+
aws-sdk-kms (1.123.0)
16+
aws-sdk-core (~> 3, >= 3.244.0)
1917
aws-sigv4 (~> 1.5)
20-
aws-sdk-s3 (1.208.0)
21-
aws-sdk-core (~> 3, >= 3.234.0)
18+
aws-sdk-s3 (1.219.0)
19+
aws-sdk-core (~> 3, >= 3.244.0)
2220
aws-sdk-kms (~> 1)
2321
aws-sigv4 (~> 1.5)
2422
aws-sigv4 (1.12.1)
2523
aws-eventstream (~> 1, >= 1.0.2)
26-
backports (3.23.0)
24+
backports (3.25.3)
2725
base64 (0.3.0)
28-
bigdecimal (4.0.1)
29-
cabin (0.9.0)
30-
clamp (1.0.1)
31-
deb-s3 (24.6.0)
26+
bigdecimal (4.1.1)
27+
cabin (0.9.1)
28+
clamp (1.5.2)
29+
deb-s3 (26.1.0)
3230
aws-sdk-s3 (~> 1)
3331
thor (~> 1)
3432
dotenv (2.8.1)
35-
fpm (1.14.2)
33+
fpm (1.17.0)
3634
arr-pm (~> 0.0.11)
3735
backports (>= 2.6.2)
38-
cabin (>= 0.6.0)
39-
clamp (~> 1.0.0)
40-
git (>= 1.3.0, < 2.0)
41-
json (>= 1.7.7, < 3.0)
36+
cabin (>= 0.9.1)
37+
clamp (>= 1.0.0)
4238
pleaserun (~> 0.0.29)
4339
rexml
4440
stud
45-
git (1.13.2)
46-
addressable (~> 2.8)
47-
rchardet (~> 1.8)
4841
insist (1.0.0)
4942
jmespath (1.6.2)
50-
json (2.6.2)
5143
logger (1.7.0)
5244
mustache (0.99.8)
53-
pleaserun (0.0.32)
45+
pleaserun (0.0.33)
5446
cabin (> 0)
5547
clamp
56-
dotenv
48+
dotenv (~> 2)
5749
insist
5850
mustache (= 0.99.8)
5951
stud
60-
public_suffix (7.0.5)
61-
rchardet (1.8.0)
62-
rexml (3.4.2)
52+
rexml (3.4.4)
6353
stud (0.0.23)
64-
thor (1.4.0)
54+
thor (1.5.0)
6555

6656
PLATFORMS
6757
ruby
@@ -71,4 +61,4 @@ DEPENDENCIES
7161
fpm
7262

7363
BUNDLED WITH
74-
2.3.14
64+
2.6.9

scripts/build-debian-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mkdir -p "$DESTINATION_PATH"
5252

5353
info "Installing dependencies"
5454

55-
bundle check || bundle
55+
bundle check || bundle install
5656

5757
info "Building debian package $PACKAGE_NAME to $DESTINATION_PATH"
5858

scripts/build-rpm-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mkdir -p "$DESTINATION_PATH"
4848

4949
info "Installing dependencies"
5050

51-
bundle check || bundle
51+
bundle check || bundle install
5252
which rpmbuild || (apt update && apt install -y rpm)
5353

5454
info "Building rpm package $PACKAGE_NAME to $DESTINATION_PATH"

0 commit comments

Comments
 (0)