Skip to content

Commit 0d648fe

Browse files
authored
Merge branch 'develop' into feature/3993-new-frontpage-elements
2 parents 9a2f88a + 616c7db commit 0d648fe

File tree

4 files changed

+63
-11
lines changed

4 files changed

+63
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
* [PR-494](https://github.com/itk-dev/hoeringsportal/pull/494)
1010
* Add config for default teaser images
11-
1211
* [PR-480](https://github.com/itk-dev/hoeringsportal/pull/480)
1312
* New paragraph section for content promotion
14-
1513
* [PR-475](https://github.com/itk-dev/hoeringsportal/pull/475)
1614
* New landingpage hero
17-
1815
* [PR-490](https://github.com/itk-dev/hoeringsportal/pull/490)
1916
* Added hearing reply fixtures
2017
* Fixed ticket author template
21-
2218
* [PR-489](https://github.com/itk-dev/hoeringsportal/pull/489)
2319
Feat: Redesigned teaser cards that makes the cards easier to distinguish from each other when listed on the same page.
20+
* [PR-491](https://github.com/itk-dev/hoeringsportal/pull/491)
21+
Optimized development setup
2422

2523
## [4.8.7] - 2025-04-04
2624

Taskfile.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ vars:
77
# https://taskfile.dev/reference/templating/
88
BASE_URL: '{{.TASK_BASE_URL | default .COMPOSE_SERVER_DOMAIN | default .COMPOSE_DOMAIN | default "https://hoeringsportal.local.itkdev.dk"}}'
99
DOCKER_COMPOSE: '{{.TASK_DOCKER_COMPOSE | default "docker compose"}}'
10+
DOCKER_COMPOSE_PROFILES: '{{.TASK_DOCKER_COMPOSE_PROFILES | default ""}}'
1011
COMPOSER_INSTALL_ARGUMENTS: '{{.TASK_COMPOSER_INSTALL_ARGUMENTS | default ""}}'
1112

1213
PRETIX_URL: '{{.TASK_PRETIX_URL | default "http://pretix.hoeringsportal.local.itkdev.dk"}}'
@@ -64,15 +65,23 @@ tasks:
6465

6566
assets-build:
6667
cmds:
67-
- '{{.DOCKER_COMPOSE}} run --rm node npm install --prefix web/themes/custom/hoeringsportal'
68-
- '{{.DOCKER_COMPOSE}} run --rm node npm run build --prefix web/themes/custom/hoeringsportal'
68+
- |
69+
if [[ -z "{{.SKIP_BUILD}}" ]]; then
70+
echo {{.DOCKER_COMPOSE}} run --rm node npm install --prefix web/themes/custom/hoeringsportal
71+
echo {{.DOCKER_COMPOSE}} run --rm node npm run build --prefix web/themes/custom/hoeringsportal
72+
fi
73+
vars:
74+
SKIP_BUILD: '{{.ASSETS_SKIP_BUILD | default .TASK_ASSETS_SKIP_BUILD}}'
75+
6976
compose:
7077
cmds:
71-
- '{{.DOCKER_COMPOSE}} --profile pretix {{.CLI_ARGS}}'
78+
- '{{.DOCKER_COMPOSE}} {{if .DOCKER_COMPOSE_PROFILES}}--profile {{.DOCKER_COMPOSE_PROFILES | splitList "," |join " --profile " }}{{end}} {{.CLI_ARGS}}'
79+
vars:
80+
DOCKER_COMPOSE_PROFILES: '{{.PROFILES | default .DOCKER_COMPOSE_PROFILES}}'
7281

7382
compose-up:
7483
cmds:
75-
- task compose -- up --detach --remove-orphans --wait
84+
- task compose -- up --detach --remove-orphans {{if .COMPOSE_UP_WAIT}}--wait{{end}}
7685
silent: true
7786

7887
composer:
@@ -225,9 +234,12 @@ tasks:
225234
fixtures:load:
226235
prompt: "This will reset your content. Continue?"
227236
cmds:
228-
- task drush -- --yes pm:enable hoeringsportal_base_fixtures $(find web/modules/custom -type f -name 'hoeringsportal_*_fixtures.info.yml' -exec basename -s .info.yml {} \;)
229-
- task drush -- --yes content-fixtures:load
230-
- task drush -- --yes pm:uninstall content_fixtures
237+
# We need the pretix service to load public meeting fixtures.
238+
- PROFILES=pretix COMPOSE_UP_WAIT=true task compose-up
239+
- task drush -- --yes pm:enable hoeringsportal_base_fixtures $(find web/modules/custom -type f -name 'hoeringsportal_*_fixtures.info.yml' -exec basename -s .info.yml {} \;)
240+
- task drush -- --yes content-fixtures:load
241+
- task drush -- --yes pm:uninstall content_fixtures
242+
- task compose-up
231243
silent: true
232244

233245
translations:import:

docker-compose.override.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ services:
1919

2020
clamav:
2121
image: clamav/clamav:1.2
22+
profiles:
23+
- clamav
2224
networks:
2325
- app
2426
ports:

documentation/localDevelopment.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,47 @@
11
# Hoeringsportal local development
22

3+
We use [Task](https://taskfile.dev/) in this project. Run
4+
5+
``` shell
6+
task site-update
7+
```
8+
9+
to update the site (previously installed by running `task site-install`).
10+
11+
For performance reasons, we start only the basic docker services by default, but you can set
12+
`TASK_DOCKER_COMPOSE_PROFILES` in `.env.local` to start more docker services based on
13+
[profiles](https://docs.docker.com/compose/how-tos/profiles/), e.g.
14+
15+
``` shell
16+
# .env.local
17+
18+
# Always start pretix and friends.
19+
TASK_DOCKER_COMPOSE_PROFILES=pretix
20+
```
21+
22+
You can also set 'PROFILES` when running the `compose` task, e.g.
23+
24+
``` shell
25+
PROFILES=pretix task compose -- up --detach
26+
```
27+
28+
> [!TIP]
29+
> Run `git grep -A2 'profiles:' '*.y*ml'` to get a crude list of all profiles in the project.
30+
31+
When running `task site-update`, theme assets are built and this may take quite some time. To skip building assets, you
32+
can run `ASSETS_SKIP_BUILD=1 task site-update` or set `TASK_ASSETS_SKIP_BUILD` in `.env.local`, e.g.
33+
34+
``` shell
35+
# .env.local
36+
37+
TASK_ASSETS_SKIP_BUILD=1
38+
```
39+
340
## Local setup
441

42+
> [!CAUTION]
43+
> The following should be updated and rewritten to reflect the actual development workflow.
44+
545
Create the file `web/sites/default/settings.local.php` and add:
646

747
```php

0 commit comments

Comments
 (0)