File tree Expand file tree Collapse file tree 5 files changed +0
-43
lines changed
lib/rails/generators/rails/devcontainer/templates/devcontainer Expand file tree Collapse file tree 5 files changed +0
-43
lines changed Original file line number Diff line number Diff line change @@ -12,10 +12,6 @@ services:
12
12
# Overrides default command so things don't shut down after the process ends.
13
13
command : sleep infinity
14
14
15
- # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
16
- networks :
17
- - default
18
-
19
15
depends_on :
20
16
- postgres
21
17
- mariadb
@@ -28,8 +24,6 @@ services:
28
24
postgres :
29
25
image : postgres:latest
30
26
restart : unless-stopped
31
- networks :
32
- - default
33
27
volumes :
34
28
- postgres-data:/var/lib/postgresql/data
35
29
environment :
@@ -40,8 +34,6 @@ services:
40
34
mariadb :
41
35
image : mariadb:latest
42
36
restart : unless-stopped
43
- networks :
44
- - default
45
37
volumes :
46
38
- mariadb-data:/var/lib/mysql
47
39
environment :
@@ -50,20 +42,13 @@ services:
50
42
redis :
51
43
image : redis:latest
52
44
restart : unless-stopped
53
- networks :
54
- - default
55
45
volumes :
56
46
- redis-data:/data
57
47
58
48
memcached :
59
49
image : memcached:latest
60
50
restart : unless-stopped
61
51
command : ["-m", "1024"]
62
- networks :
63
- - default
64
-
65
- networks :
66
- default :
67
52
68
53
volumes :
69
54
postgres-data :
Original file line number Diff line number Diff line change @@ -12,16 +12,11 @@ services:
12
12
# Overrides default command so things don't shut down after the process ends.
13
13
command: sleep infinity
14
14
15
- networks:
16
- - default
17
-
18
15
# Uncomment the next line to use a non-root user for all processes.
19
16
# user: vscode
20
17
21
18
# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
22
19
# (Adding the "ports" property to this file will not forward from a Codespace.)
23
- ports:
24
- - 45678:45678
25
20
<%- if !dependencies.empty? -%>
26
21
depends_on:
27
22
<%- dependencies.each do |dependency| -%>
@@ -33,16 +28,12 @@ services:
33
28
selenium:
34
29
image: seleniarm/standalone-chromium
35
30
restart: unless-stopped
36
- networks:
37
- - default
38
31
<%- end -%>
39
32
40
33
<%- if options[:redis] -%>
41
34
redis:
42
35
image: redis:7.2
43
36
restart: unless-stopped
44
- networks:
45
- - default
46
37
volumes:
47
38
- redis-data:/data
48
39
Original file line number Diff line number Diff line change @@ -9,6 +9,3 @@ services:
9
9
10
10
# Overrides default command so things don't shut down after the process ends.
11
11
command : sleep infinity
12
-
13
- networks :
14
- - default
Original file line number Diff line number Diff line change @@ -10,36 +10,24 @@ services:
10
10
# Overrides default command so things don't shut down after the process ends.
11
11
command : sleep infinity
12
12
13
- networks :
14
- - default
15
-
16
13
# Uncomment the next line to use a non-root user for all processes.
17
14
# user: vscode
18
15
19
16
# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
20
17
# (Adding the "ports" property to this file will not forward from a Codespace.)
21
- ports :
22
- - 45678:45678
23
18
depends_on :
24
19
- selenium
25
20
- redis
26
21
27
22
selenium :
28
23
image : seleniarm/standalone-chromium
29
24
restart : unless-stopped
30
- networks :
31
- - default
32
25
33
26
redis :
34
27
image : redis:7.2
35
28
restart : unless-stopped
36
- networks :
37
- - default
38
29
volumes :
39
30
- redis-data:/data
40
31
41
-
42
-
43
-
44
32
volumes :
45
33
redis-data :
Original file line number Diff line number Diff line change @@ -1240,8 +1240,6 @@ def test_devcontainer
1240
1240
} ,
1241
1241
"volumes" => [ "../..:/workspaces:cached" ] ,
1242
1242
"command" => "sleep infinity" ,
1243
- "networks" => [ "default" ] ,
1244
- "ports" => [ "45678:45678" ] ,
1245
1243
"depends_on" => [ "selenium" , "redis" ]
1246
1244
}
1247
1245
@@ -1250,15 +1248,13 @@ def test_devcontainer
1250
1248
expected_selenium_conifg = {
1251
1249
"image" => "seleniarm/standalone-chromium" ,
1252
1250
"restart" => "unless-stopped" ,
1253
- "networks" => [ "default" ]
1254
1251
}
1255
1252
1256
1253
assert_equal expected_selenium_conifg , compose_config [ "services" ] [ "selenium" ]
1257
1254
1258
1255
expected_redis_config = {
1259
1256
"image" => "redis:7.2" ,
1260
1257
"restart" => "unless-stopped" ,
1261
- "networks" => [ "default" ] ,
1262
1258
"volumes" => [ "redis-data:/data" ]
1263
1259
}
1264
1260
You can’t perform that action at this time.
0 commit comments