Skip to content

Commit

Permalink
[TASK] Streamline local development enviroment
Browse files Browse the repository at this point in the history
Only ddev based enviroment is supported from now on. The native
docker environment was finally dropped.
  • Loading branch information
mschwemer committed Feb 2, 2024
1 parent 6948608 commit 0c0e9fb
Show file tree
Hide file tree
Showing 27 changed files with 90 additions and 738 deletions.
31 changes: 26 additions & 5 deletions .ddev/commands/host/initialize
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,30 @@ then
fi

git lfs pull
ddev import-db --src=.project/data/db.sql.gz

echo "Symlink configuration"
cp .build/vendor/typo3/cms-install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .build/public/.htaccess
mkdir -p .build/config/sites/main
ln -snf ../../../../.project/typo3/config.yaml .build/config/sites/main/config.yaml
mkdir -p .build/config/system
ln -snf ../../../.project/typo3/settings.php .build/config/system/settings.php
ln -snf ../../../.project/typo3/additional.php .build/config/system/additional.php

echo "Importing database"
ddev import-db --file=.project/data/db.sql.gz

echo "Run 'composer install'"
ddev composer install
cp .Build/vendor/typo3/cms-install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .Build/Web/.htaccess
mkdir -p config/sites/main && cp .project/TYPO3/config.yaml config/sites/main/
mkdir -p config/system && cp .ddev/typo3/*.php config/system
mkdir -p .Build/Web/fileadmin && cd .Build/Web && tar xf ../../.project/data/fileadmin.tar.gz

echo "Extracting fileadmin"
tar xf .project/data/fileadmin.tar.gz -C .build/public/

echo "Copy .htaccess"
cp .build/vendor/typo3/cms-install/Resources/Private/FolderStructureTemplateFiles/root-htaccess .build/public/.htaccess

echo "Update Languages (needed for behaviour tests)"
ddev typo3 language:update

ddev describe

echo "Thanks for supporting 'EXT:powermail"
2 changes: 1 addition & 1 deletion .ddev/commands/web/typo3
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
## Example: "ddev typo3 site:list" or "ddev typo3 list" or "ddev typo3 extension:list"
## ProjectTypes: typo3

.Build/bin/typo3 "$@"
.build/vendor/bin/typo3 "$@"
10 changes: 6 additions & 4 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
name: powermail
name: powermail-v12
type: typo3
docroot: .Build/Web/
docroot: .build/public/
php_version: "8.1"
webserver_type: apache-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.3"
database:
type: "mariadb"
version: "10.3"
mysql_version: ""
use_dns_when_possible: true
composer_version: "2"
web_environment: []
hooks:
post-start:
- exec: composer install
host_db_port: "28262"
host_db_port: "64241"

# This config.yaml was created with ddev version v1.17.5
# webimage: drud/ddev-webserver:v1.17.4
Expand Down
16 changes: 6 additions & 10 deletions .ddev/docker-compose.typo3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ services:
web:
environment:
- TYPO3_CONTEXT=Development/DDEV
# Variables for first installation
- TYPO3_INSTALL_DB_DRIVER=mysql
- TYPO3_INSTALL_DB_USER=db
- TYPO3_INSTALL_DB_PASSWORD=db
- TYPO3_INSTALL_DB_HOST=db
- TYPO3_INSTALL_DB_PORT=3306
- TYPO3_INSTALL_DB_USE_EXISTING=1
- TYPO3_INSTALL_DB_DBNAME=db
- TYPO3_INSTALL_SITE_SETUP_TYPE=no
- TYPO3_INSTALL_WEB_SERVER_CONFIG=none
- TYPO3_PATH_APP=/var/www/html/.build
- MYSQL_DATABASE=db
- MYSQL_PASSWORD=db
- MYSQL_USER=db
- MYSQL_HOST=db
- MAIL_HOST=mail:1025
42 changes: 0 additions & 42 deletions .ddev/typo3/additional.php

This file was deleted.

20 changes: 0 additions & 20 deletions .ddev/typo3/config.yaml

This file was deleted.

40 changes: 0 additions & 40 deletions .env

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Thumbs.db
.svn
.sass-cache
.php-cs-fixer.cache
.Build
.build
composer.lock
package-lock.json
var
Expand Down
46 changes: 0 additions & 46 deletions .project/TYPO3/DockerConfiguration.php

This file was deleted.

68 changes: 0 additions & 68 deletions .project/docker/docker-compose.darwin.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .project/docker/docker-compose.unix.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .project/docker/php/Dockerfile

This file was deleted.

2 changes: 0 additions & 2 deletions .project/docker/php/zz_xdebug.ini

This file was deleted.

Loading

0 comments on commit 0c0e9fb

Please sign in to comment.