Skip to content

Commit fadcc26

Browse files
⬆️ Upgrade dependencies to Bolt 5.2 (#131)
* the composer.lock is not need in repository * ⬆️ bump bolt/asset 5.2 * revert cahnge * 🚧 use the latest 5.2 beta for bolt/assets * yse yaml extension for Docker compose configuration file * bump bolt/core to 5.2 * review changes * revert change * revert PHP healthcheck configuration * Update compose.yaml --------- Co-authored-by: Bob van de Vijver <bobvandevijver@users.noreply.github.com>
1 parent 068ba3e commit fadcc26

File tree

8 files changed

+8
-22
lines changed

8 files changed

+8
-22
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ __*
2626
.*.swp
2727
.swp
2828
*.lock
29-
!composer.lock
3029
!symfony.lock
3130
*lock.json
3231
.buildpath

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ VOLUME /srv/bolt/var
119119
COPY docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
120120
RUN chmod +x /usr/local/bin/docker-healthcheck
121121

122-
HEALTHCHECK --interval=10s --timeout=3s --retries=3 CMD ["docker-healthcheck"]
122+
HEALTHCHECK --interval=10s --timeout=3s --retries=3 --start-period=30s CMD ["docker-healthcheck"]
123123

124124
COPY docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
125125
RUN chmod +x /usr/local/bin/docker-entrypoint

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,7 @@ composer run post-create-project-cmd # Duplicate themes in the appropriate folde
4747
bin/console bolt:info # Verify Bolt installation
4848
```
4949

50-
Run Bolt using the built-in webserver, Symfony CLI or your own preferred webserver:
51-
52-
```bash
53-
bin/console server:start
54-
```
55-
56-
or…
50+
Run Bolt using Symfony CLI or your own preferred webserver:
5751

5852
```bash
5953
symfony server:start -d

README_project.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,9 @@ Set up the database, create the first user and add fixtures (dummy content):
3535
bin/console bolt:setup
3636
```
3737

38-
Run Bolt using the built-in webserver, Symfony CLI, Docker or your own
38+
Run Bolt using Symfony CLI, Docker or your own
3939
preferred webserver:
4040

41-
```bash
42-
bin/console server:start
43-
```
44-
45-
or…
46-
4741
```bash
4842
symfony server:start -d
4943
symfony open:local

docker-compose.yml renamed to compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.4'
2-
31
services:
42
db:
53
image: mysql:5.7

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"bobdenotter/configuration-notices": "^1.3",
99
"bobdenotter/weatherwidget": "^1.1",
1010
"bolt/article": "^2.0",
11-
"bolt/assets": "^5.1",
12-
"bolt/core": "^5.1",
11+
"bolt/assets": "~5.2",
12+
"bolt/core": "~5.2",
1313
"bolt/newswidget": "^1.3",
1414
"bolt/redactor": "^2.0",
1515
"bolt/themes": "^3.5",
@@ -43,7 +43,7 @@
4343
"public-dir": "public",
4444
"symfony": {
4545
"allow-contrib": true,
46-
"require": "^5.1"
46+
"require": "^5.4"
4747
}
4848
},
4949
"autoload": {

config/checkpoint.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.8
1+
5.2.0

config/services_bolt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
_defaults:
55
autowire: true
66
autoconfigure: true
7+
bind: { }
78
BobdenOtter\ConfigurationNotices\:
89
resource: '../vendor/bobdenotter/configuration-notices/src/*'
910
exclude: '../vendor/bobdenotter/configuration-notices/src/{Entity,Exception}'

0 commit comments

Comments
 (0)