Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Update testbed TYPO3 13 LTS dependencies, make testbed working offline #124

Merged
merged 3 commits into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .ddev/apache/20.conf
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<VirtualHost *:80>
ServerName sub.t3api.ddev.site
ServerAlias *.t3api.ddev.site
ServerAlias *-api.t3api.ddev.site
ServerAlias *.api.t3api.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$
RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L]
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ [OR]
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.api\.t3api\.ddev\.site$
RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L]

RewriteCond %{HTTP:X-Forwarded-Proto} =https
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d
Expand All @@ -24,15 +25,16 @@
<VirtualHost *:443>
ServerName sub.t3api.ddev.site
ServerAlias *.t3api.ddev.site
ServerAlias *-api.t3api.ddev.site
ServerAlias *.api.t3api.ddev.site
DocumentRoot /var/www/html/.test
<Directory "/var/www/html/.test">
AllowOverride All
Allow from All
</Directory>

RewriteEngine On
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.t3api\.ddev\.site$ [OR]
RewriteCond %{HTTP_HOST} ^([a-z0-9-]+)\.api\.t3api\.ddev\.site$
RewriteRule ^(.*)$ /var/www/html/.test/%1/public/$1 [L]

RewriteCond %{HTTP:X-Forwarded-Proto} =https
Expand Down
4 changes: 2 additions & 2 deletions .ddev/commands/web/.install-12
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ composer req typo3/cms-backend:'^12.4' typo3/cms-core:'^12.4' typo3/cms-extbase:
typo3/cms-fluid:'^12.4' typo3/cms-frontend:'^12.4' typo3/cms-recycler:'^12.4' typo3/cms-tstemplate:'^12.4' \
typo3/cms-info:'^12.4' typo3/cms-lowlevel:'^12.4' typo3/cms-rte-ckeditor:'^12.4' typo3/cms-impexp:'^12.4' \
typo3/cms-install:'^12.4' \
helhum/typo3-console:'^8.1' \
cweagans/composer-patches:'^1.7.3' georgringer/news:'dev-12-13' \
helhum/typo3-console:'^8.2.1' \
cweagans/composer-patches:'^1.7.3' georgringer/news:'^12.1' \
sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \
sourcebroker/t3api:'@dev' \
--no-progress --no-interaction --working-dir "$BASE_PATH"
Expand Down
19 changes: 8 additions & 11 deletions .ddev/commands/web/.install-13
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ set -e
source .ddev/test/utils-install.sh
install_start "13"

# remove next two lines later after stable version of helhum/typo3-console START
composer config repositories.helhum/typo3-console vcs https://github.com/bmack/TYPO3-Console --working-dir $BASE_PATH
cp ".ddev/test/files/patches/typo3-cms-core-review-85198.patch" $BASE_PATH/patches/
composer req typo3/cms-backend:'^13.3' typo3/cms-core:'^13.3' typo3/cms-extbase:'^13.3' typo3/cms-filelist:'^13.3' \
typo3/cms-fluid:'^13.3' typo3/cms-frontend:'^13.3' typo3/cms-recycler:'^13.3' typo3/cms-tstemplate:'^13.3' \
typo3/cms-info:'^13.3' typo3/cms-lowlevel:'^13.3' typo3/cms-rte-ckeditor:'^13.3' typo3/cms-impexp:'^13.3' \
typo3/cms-install:'^13.3' \
helhum/typo3-console:'dev-issue/1169' \
cweagans/composer-patches:'^1.7.3' georgringer/news:'dev-12-13' \
sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \
sourcebroker/t3api:'@dev' \
--no-progress --no-interaction --working-dir "$BASE_PATH"
typo3/cms-fluid:'^13.3' typo3/cms-frontend:'^13.3' typo3/cms-recycler:'^13.3' typo3/cms-tstemplate:'^13.3' \
typo3/cms-info:'^13.3' typo3/cms-lowlevel:'^13.3' typo3/cms-rte-ckeditor:'^13.3' typo3/cms-impexp:'^13.3' \
typo3/cms-install:'^13.3' \
helhum/typo3-console:'^8.2.1' \
cweagans/composer-patches:'^1.7.3' georgringer/news:'^12.1' \
sourcebroker/t3apinews:'^1.0.0' v/site:'^1.0.0' \
sourcebroker/t3api:'@dev' \
--no-progress --no-interaction --working-dir "$BASE_PATH"

install_end
6 changes: 4 additions & 2 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames:
- '*.t3api'
- '*.api.t3api'
- 12.t3api
- 12.api.t3api
- 13.t3api
- 13.api.t3api
additional_fqdns: []
database:
type: mariadb
Expand Down
48 changes: 0 additions & 48 deletions .ddev/test/files/patches/typo3-cms-core-review-85198.patch

This file was deleted.