Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Commit 8e6b057

Browse files
fix: Update editorconfig to properly cover yaml and update formatting (#1951)
1 parent 5125ef3 commit 8e6b057

File tree

4 files changed

+76
-76
lines changed

4 files changed

+76
-76
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.yml]
14+
[*.{yml,yaml,yaml.example}]
1515
indent_size = 2

Homestead.yaml.example

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ provider: virtualbox
77
authorize: ~/.ssh/id_rsa.pub
88

99
keys:
10-
- ~/.ssh/id_rsa
10+
- ~/.ssh/id_rsa
1111

1212
folders:
13-
- map: ~/code
14-
to: /home/vagrant/code
13+
- map: ~/code
14+
to: /home/vagrant/code
1515

1616
sites:
17-
- map: homestead.test
18-
to: /home/vagrant/code/public
17+
- map: homestead.test
18+
to: /home/vagrant/code/public
1919

2020
databases:
21-
- homestead
21+
- homestead
2222

2323
features:
24-
- mariadb: false
25-
- postgresql: false
26-
- ohmyzsh: false
27-
- webdriver: false
28-
- influxdb: false
24+
- mariadb: false
25+
- postgresql: false
26+
- ohmyzsh: false
27+
- webdriver: false
28+
- influxdb: false
2929

3030
services:
31-
- enabled:
32-
- "mysql"
33-
# - disabled:
34-
# - "postgresql@11-main"
35-
36-
#ports:
37-
# - send: 33060 # MySQL/MariaDB
38-
# to: 3306
39-
# - send: 4040
40-
# to: 4040
41-
# - send: 54320 # PostgreSQL
42-
# to: 5432
43-
# - send: 8025 # Mailpit
44-
# to: 8025
45-
# - send: 9600
46-
# to: 9600
47-
# - send: 27017
48-
# to: 27017
31+
- enabled:
32+
- "mysql"
33+
# - disabled:
34+
# - "postgresql@11-main"
35+
36+
# ports:
37+
# - send: 33060 # MySQL/MariaDB
38+
# to: 3306
39+
# - send: 4040
40+
# to: 4040
41+
# - send: 54320 # PostgreSQL
42+
# to: 5432
43+
# - send: 8025 # Mailpit
44+
# to: 8025
45+
# - send: 9600
46+
# to: 9600
47+
# - send: 27017
48+
# to: 27017

resources/Homestead.yaml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@ provider: virtualbox
77
authorize: ~/.ssh/id_rsa.pub
88

99
keys:
10-
- ~/.ssh/id_rsa
10+
- ~/.ssh/id_rsa
1111

1212
folders:
13-
- map: ~/code
14-
to: /home/vagrant/code
13+
- map: ~/code
14+
to: /home/vagrant/code
1515

1616
sites:
17-
- map: homestead.test
18-
to: /home/vagrant/code/public
17+
- map: homestead.test
18+
to: /home/vagrant/code/public
1919

2020
databases:
21-
- homestead
21+
- homestead
2222

2323
features:
24-
- mariadb: false
25-
- postgresql: false
26-
- ohmyzsh: false
27-
- webdriver: false
24+
- mariadb: false
25+
- postgresql: false
26+
- ohmyzsh: false
27+
- webdriver: false
2828

2929
services:
30-
- enabled:
31-
- "mysql"
32-
# - disabled:
33-
# - "postgresql@11-main"
34-
35-
#ports:
36-
# - send: 33060 # MySQL/MariaDB
37-
# to: 3306
38-
# - send: 4040
39-
# to: 4040
40-
# - send: 54320 # PostgreSQL
41-
# to: 5432
42-
# - send: 8025 # Mailpit
43-
# to: 8025
44-
# - send: 9600
45-
# to: 9600
46-
# - send: 27017
47-
# to: 27017
30+
- enabled:
31+
- "mysql"
32+
# - disabled:
33+
# - "postgresql@11-main"
34+
35+
# ports:
36+
# - send: 33060 # MySQL/MariaDB
37+
# to: 3306
38+
# - send: 4040
39+
# to: 4040
40+
# - send: 54320 # PostgreSQL
41+
# to: 5432
42+
# - send: 8025 # Mailpit
43+
# to: 8025
44+
# - send: 9600
45+
# to: 9600
46+
# - send: 27017
47+
# to: 27017

scripts/features/dockstead/mysql-5.7.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#
55
version: "3.7"
66
services:
7-
mysql:
8-
image: mysql:5.7
9-
volumes:
10-
- type: volume
11-
source: mysql-data
12-
target: /var/lib/mysql
13-
volume:
14-
nocopy: true
15-
ports:
16-
- "3306:3306"
17-
healthcheck:
18-
test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
19-
interval: 3s
20-
timeout: 1s
21-
retries: 5
22-
env_file:
23-
- env.docker
7+
mysql:
8+
image: mysql:5.7
9+
volumes:
10+
- type: volume
11+
source: mysql-data
12+
target: /var/lib/mysql
13+
volume:
14+
nocopy: true
15+
ports:
16+
- "3306:3306"
17+
healthcheck:
18+
test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
19+
interval: 3s
20+
timeout: 1s
21+
retries: 5
22+
env_file:
23+
- env.docker
2424
volumes:
25-
mysql-data:
25+
mysql-data:

0 commit comments

Comments
 (0)