Skip to content

Commit 6f18041

Browse files
committed
bump default ruby to 3.3.6, bump default rails to 8.0.0
1 parent 87b86de commit 6f18041

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUBY_VERSION=3.3.5
1+
ARG RUBY_VERSION=3.3.6
22
FROM ruby:${RUBY_VERSION}
33

44
ARG NODE_VERSION=22

Dockerfile.unix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUBY_VERSION=3.3.5
1+
ARG RUBY_VERSION=3.3.6
22
FROM ruby:${RUBY_VERSION}
33

44
ARG USER_ID=1000

src/docker_client.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ mod tests {
9090

9191
#[test]
9292
fn build_image() {
93-
let command = DockerClient::build_image("3.3.5", "7.2.1", None, None);
93+
let command = DockerClient::build_image("3.3.6", "8.0.0", None, None);
9494

9595
assert_eq!(command.get_program(), "docker");
9696

@@ -101,19 +101,19 @@ mod tests {
101101
&[
102102
"build",
103103
"--build-arg",
104-
"RUBY_VERSION=3.3.5",
104+
"RUBY_VERSION=3.3.6",
105105
"--build-arg",
106-
"RAILS_VERSION=7.2.1",
106+
"RAILS_VERSION=8.0.0",
107107
"-t",
108-
"rails-new-3.3.5-7.2.1",
108+
"rails-new-3.3.6-8.0.0",
109109
"-",
110110
]
111111
);
112112
}
113113

114114
#[test]
115115
fn build_image_with_user_id() {
116-
let command = DockerClient::build_image("3.3.5", "7.2.1", Some(1000), None);
116+
let command = DockerClient::build_image("3.3.6", "8.0.0", Some(1000), None);
117117

118118
assert_eq!(command.get_program(), "docker");
119119

@@ -124,21 +124,21 @@ mod tests {
124124
&[
125125
"build",
126126
"--build-arg",
127-
"RUBY_VERSION=3.3.5",
127+
"RUBY_VERSION=3.3.6",
128128
"--build-arg",
129-
"RAILS_VERSION=7.2.1",
129+
"RAILS_VERSION=8.0.0",
130130
"--build-arg",
131131
"USER_ID=1000",
132132
"-t",
133-
"rails-new-3.3.5-7.2.1",
133+
"rails-new-3.3.6-8.0.0",
134134
"-",
135135
]
136136
);
137137
}
138138

139139
#[test]
140140
fn build_image_with_group_id() {
141-
let command = DockerClient::build_image("3.3.5", "7.2.1", None, Some(1000));
141+
let command = DockerClient::build_image("3.3.6", "8.0.0", None, Some(1000));
142142

143143
assert_eq!(command.get_program(), "docker");
144144

@@ -149,21 +149,21 @@ mod tests {
149149
&[
150150
"build",
151151
"--build-arg",
152-
"RUBY_VERSION=3.3.5",
152+
"RUBY_VERSION=3.3.6",
153153
"--build-arg",
154-
"RAILS_VERSION=7.2.1",
154+
"RAILS_VERSION=8.0.0",
155155
"--build-arg",
156156
"GROUP_ID=1000",
157157
"-t",
158-
"rails-new-3.3.5-7.2.1",
158+
"rails-new-3.3.6-8.0.0",
159159
"-",
160160
]
161161
);
162162
}
163163

164164
#[test]
165165
fn run_image() {
166-
let command = DockerClient::run_image("3.3.5", "7.2.1", vec!["my_app".to_string()]);
166+
let command = DockerClient::run_image("3.3.6", "8.0.0", vec!["my_app".to_string()]);
167167

168168
assert_eq!(command.get_program(), "docker");
169169

@@ -182,7 +182,7 @@ mod tests {
182182
&format!("{}:{}", current_dir, current_dir),
183183
"-w",
184184
current_dir,
185-
"rails-new-3.3.5-7.2.1",
185+
"rails-new-3.3.6-8.0.0",
186186
"rails",
187187
"new",
188188
"my_app",
@@ -192,7 +192,7 @@ mod tests {
192192

193193
#[test]
194194
fn get_help() {
195-
let command = DockerClient::get_help("3.3.5", "7.2.1");
195+
let command = DockerClient::get_help("3.3.6", "8.0.0");
196196

197197
assert_eq!(command.get_program(), "docker");
198198

@@ -203,7 +203,7 @@ mod tests {
203203
&[
204204
"run",
205205
"--rm",
206-
"rails-new-3.3.5-7.2.1",
206+
"rails-new-3.3.6-8.0.0",
207207
"rails",
208208
"new",
209209
"--help",

src/rails_new.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pub struct Cli {
66
#[clap(trailing_var_arg = true, required = true)]
77
/// arguments passed to `rails new`
88
pub args: Vec<String>,
9-
#[clap(long, short = 'u', default_value = "3.3.5")]
9+
#[clap(long, short = 'u', default_value = "3.3.6")]
1010
pub ruby_version: String,
11-
#[clap(long, short = 'r', default_value = "7.2.1")]
11+
#[clap(long, short = 'r', default_value = "8.0.0")]
1212
pub rails_version: String,
1313

1414
#[command(subcommand)]
@@ -54,8 +54,8 @@ mod tests {
5454
let ruby_version = m.get_one::<String>("ruby_version").unwrap();
5555
let rails_version = m.get_one::<String>("rails_version").unwrap();
5656

57-
assert_eq!(ruby_version, "3.3.5");
58-
assert_eq!(rails_version, "7.2.1");
57+
assert_eq!(ruby_version, "3.3.6");
58+
assert_eq!(rails_version, "8.0.0");
5959

6060
Ok(())
6161
}

0 commit comments

Comments
 (0)