iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename `docker-compose` to `docker compose`

This commit is contained in:
Thomas Rupprecht 2023-01-25 00:05:21 +01:00 committed by Igor Scheller
parent cbdee7a9f3
commit c147f06b91
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DEVELOPMENT.md
View File

@ -49,39 +49,39 @@ Run this once
```bash
cd docker/dev
docker-compose up
docker compose up
```
Run these commands once initially and then as required after changes
```bash
# Install composer dependencies
docker-compose exec es_workspace composer i
docker compose exec es_workspace composer i
# Install node packages
docker-compose exec es_workspace yarn install
docker compose exec es_workspace yarn install
# Run a full front-end build
docker-compose exec es_workspace yarn build
docker compose exec es_workspace yarn build
# Or run a front-end build for specific themes only, e.g.
docker-compose exec -e THEMES=0,1 es_workspace yarn build
docker compose exec -e THEMES=0,1 es_workspace yarn build
# Update the translation files
docker-compose exec es_workspace find /var/www/resources/lang -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
docker compose exec es_workspace find /var/www/resources/lang -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
# Run the migrations
docker-compose exec es_workspace bin/migrate
docker compose exec es_workspace bin/migrate
```
While developing you may use the watch mode to rebuild the system on changes
```bash
# Run a front-end build and update on change
docker-compose exec es_workspace yarn build:watch
docker compose exec es_workspace yarn build:watch
# Or run a front-end build and update on change for specific themes only, e.g.
docker-compose exec -e THEMES=0,1 es_workspace yarn build:watch
docker compose exec -e THEMES=0,1 es_workspace yarn build:watch
```
## Localhost
@ -153,7 +153,7 @@ To view the output of `dump` call the following commands:
```bash
vendor/bin/var-dump-server
# or for running in docker
docker-compose exec es_server vendor/bin/var-dump-server
docker compose exec es_server vendor/bin/var-dump-server
```
For more information check out the Var Dump Server documentation: [Symfony VarDumper](https://symfony.com/components/VarDumper)

6
README.md
View File

@ -55,7 +55,7 @@ The Engelsystem can now be used.
To build the `es_server` container:
```bash
cd docker
docker-compose build
docker compose build
```
or to build the container by its own:
@ -67,14 +67,14 @@ docker build -f docker/Dockerfile . -t es_server
Start the Engelsystem
```bash
cd docker
docker-compose up -d
docker compose up -d
```
#### Migrate
Import database changes to migrate it to the newest version
```bash
cd docker
docker-compose exec es_server bin/migrate
docker compose exec es_server bin/migrate
```
### Scripts