File tree Expand file tree Collapse file tree 5 files changed +28
-19
lines changed Expand file tree Collapse file tree 5 files changed +28
-19
lines changed Original file line number Diff line number Diff line change 3232 "test:e2e:ci" : " turbo run test:e2e:ci --parallel" ,
3333 "ddev:init" : " ./scripts/init-drupal.sh" ,
3434 "ddev:init:basic" : " ./scripts/init-drupal.sh --starter basic-starter" ,
35+ "ddev:init:pages" : " ./scripts/init-drupal.sh --starter pages-starter" ,
3536 "ddev:destroy" : " ./scripts/destroy-drupal.sh"
3637 },
3738 "devDependencies" : {
Original file line number Diff line number Diff line change @@ -4,14 +4,28 @@ docroot: drupal/web
44php_version : " 8.3"
55webserver_type : nginx-fpm
66xdebug_enabled : false
7- additional_hostnames : []
7+ additional_hostnames :
8+ - frontend
89additional_fqdns : []
910database :
1011 type : mariadb
1112 version : " 10.11"
1213use_dns_when_possible : true
14+ hooks :
15+ post-start :
16+ - exec : |
17+ composer create drupal/recommended-project tmp
18+ mv -n tmp/* drupal
19+ rm -rf tmp
20+ cd starters/${STARTER_NAME} && npm install && pm2 start "npm run dev --experimental-https"
1321composer_version : " 2"
1422composer_root : drupal
15- web_environment : []
23+ web_environment :
24+ - STARTER_NAME=@STARTER_NAME
1625corepack_enable : true
17- nodejs_version : " 20"
26+ web_extra_exposed_ports :
27+ - name : frontend
28+ container_port : 3000
29+ http_port : 3080
30+ https_port : 3433
31+ nodejs_version : " 22"
Original file line number Diff line number Diff line change @@ -3,14 +3,14 @@ services:
33 container_name : frontend
44 image : node:22
55 volumes :
6- - ./../starters/basic-starter :/var/www/html/starters/basic-starter
7- working_dir : /var/www/html/starters/basic-starter
6+ - ./../starters/${STARTER_NAME} :/var/www/html/starters/${STARTER_NAME}
7+ working_dir : /var/www/html/starters/${STARTER_NAME}
88 command :
99 - sh
1010 - -c
1111 - |
12- yarn install
13- yarn dev
12+ npm install
13+ npm run dev
1414 ports :
1515 - " 3000:3000"
1616 environment :
Original file line number Diff line number Diff line change 1+ RUN npm install -g pm2
Original file line number Diff line number Diff line change @@ -59,19 +59,12 @@ cp -r ../starters .
5959# Add the ddev config.
6060mkdir .ddev
6161cp ../scripts/config/.ddev/config.yaml .ddev/config.yaml
62- cp ../scripts/config/.ddev/docker-compose.frontend.yaml .ddev/docker-compose.frontend.yaml
63- ddev start
64-
65- # Move starts to a temp folder outside working dir
66- rm -rf ../temp-starts
67- mkdir ../temp-starts
68- mv starters ../temp-starts
62+ cp -R ../scripts/config/.ddev/web-build .ddev
63+ # cp ../scripts/config/.ddev/docker-compose.frontend.yaml .ddev/docker-compose.frontend.yaml
64+ # Replace @STARTER_NAME with actual starter name
65+ sed -i ' ' -e " s/@STARTER_NAME/$STARTER_NAME /g" .ddev/config.yaml
6966
70- ddev composer create drupal/recommended-project
71-
72- # Move starters back.
73- rm -rf starters
74- mv ../temp-starts/starters .
67+ ddev start
7568
7669# Prevent composer scaffolding from overwriting development.services.yml
7770ddev composer config --json extra.drupal-scaffold.file-mapping ' {"[web-root]/sites/development.services.yml": false}'
You can’t perform that action at this time.
0 commit comments