Commit bd617f97 authored by Thomas Löffler's avatar Thomas Löffler

Clean composer.json file

* Move bin folder to vendor/bin
* Adjust ddev and deployment to use the new bin folder
* Remove composer.typo3.org repository
* Use composer install --no-dev for deployment
* Use typo3/cms-core as dependency
parent 377dcdee
Pipeline #4800 failed with stages
in 2 minutes and 8 seconds
...@@ -13,12 +13,12 @@ hooks: ...@@ -13,12 +13,12 @@ hooks:
- exec: composer install -d /var/www/html - exec: composer install -d /var/www/html
- exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build
- exec: ../bin/typo3cms install:generatepackagestates - exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../bin/typo3cms install:extensionsetupifpossible - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php - exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
# This config.yaml was created with ddev version v0.19.0 # This config.yaml was created with ddev version v0.19.0
# webimage: drud/nginx-php-fpm-local:v0.19.0 # webimage: drud/nginx-php-fpm-local:v0.19.0
# dbimage: drud/mariadb-local:v0.19.0 # dbimage: drud/mariadb-local:v0.19.0
# dbaimage: drud/phpmyadmin:v0.19.0 # dbaimage: drud/phpmyadmin:v0.19.0
...@@ -28,7 +28,7 @@ hooks: ...@@ -28,7 +28,7 @@ hooks:
# Key features of ddev's config.yaml: # Key features of ddev's config.yaml:
# name: <projectname> # Name of the project, automatically provides # name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.local and https://projectname.ddev.local # http://projectname.ddev.local and https://projectname.ddev.local
# type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php # type: <projecttype> # drupal6/7/8, backdrop, typo3, wordpress, php
...@@ -37,12 +37,12 @@ hooks: ...@@ -37,12 +37,12 @@ hooks:
# php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2" # php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2"
# You can explicitly specify the webimage, dbimage, dbaimage lines but this # You can explicitly specify the webimage, dbimage, dbaimage lines but this
# is not recommended, as the images are often closely tied to ddev's' behavior, # is not recommended, as the images are often closely tied to ddev's' behavior,
# so this can break upgrades. # so this can break upgrades.
# webimage: <docker_image> # nginx/php docker image. # webimage: <docker_image> # nginx/php docker image.
# dbimage: <docker_image> # mariadb docker image. # dbimage: <docker_image> # mariadb docker image.
# dbaimage: <docker_image> # dbaimage: <docker_image>
# router_http_port: <port> # Port to be used for http (defaults to port 80) # router_http_port: <port> # Port to be used for http (defaults to port 80)
...@@ -65,4 +65,4 @@ hooks: ...@@ -65,4 +65,4 @@ hooks:
# for them. Example: # for them. Example:
#hooks: #hooks:
# post-start: # post-start:
# - exec: "composer install -d /var/www/html" # - exec: "composer install -d /var/www/html"
\ No newline at end of file
...@@ -27,7 +27,8 @@ test: ...@@ -27,7 +27,8 @@ test:
- apk add git --update - apk add git --update
- export TYPO3_PATH_WEB="$PWD/html" - export TYPO3_PATH_WEB="$PWD/html"
- export COMPOSER_CACHE_DIR=.cache/composer - export COMPOSER_CACHE_DIR=.cache/composer
- php -r "copy('https://getcomposer.org/composer.phar', 'composer.phar');" - curl https://getcomposer.org/composer.phar -o composer.phar --silent
- chmod +x composer.phar
- php composer.phar install - php composer.phar install
- mkdir $TYPO3_PATH_WEB/fileadmin/ && touch $TYPO3_PATH_WEB/fileadmin/currentcoredata.json - mkdir $TYPO3_PATH_WEB/fileadmin/ && touch $TYPO3_PATH_WEB/fileadmin/currentcoredata.json
script: script:
...@@ -48,7 +49,7 @@ build: ...@@ -48,7 +49,7 @@ build:
script: script:
- ./composer.phar config store-auths false - ./composer.phar config store-auths false
- ./composer.phar config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN} - ./composer.phar config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
- ./composer.phar install --no-interaction --no-progress - ./composer.phar install --no-interaction --no-progress --no-dev
artifacts: artifacts:
paths: paths:
- ./ - ./
......
...@@ -4,7 +4,6 @@ namespace Deployer; ...@@ -4,7 +4,6 @@ namespace Deployer;
require_once '/composer/vendor/deployer/deployer/recipe/common.php'; require_once '/composer/vendor/deployer/deployer/recipe/common.php';
require_once '/composer/vendor/deployer/recipes/rsync.php'; require_once '/composer/vendor/deployer/recipes/rsync.php';
require_once '/composer/vendor/deployer/recipes/cachetool.php';
$sharedDirectories = [ $sharedDirectories = [
'html/fileadmin', 'html/fileadmin',
......
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
"issues": "https://git-t3o.typo3.org/t3o/ter/issues" "issues": "https://git-t3o.typo3.org/t3o/ter/issues"
}, },
"repositories": [ "repositories": [
{
"type": "composer",
"url": "https://composer.typo3.org"
},
{ {
"type": "vcs", "type": "vcs",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git" "url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
...@@ -27,7 +23,7 @@ ...@@ -27,7 +23,7 @@
], ],
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"typo3/cms": "^8.7", "typo3/cms-core": "^8.7",
"helhum/typo3-console": "^5.0", "helhum/typo3-console": "^5.0",
"dmitryd/typo3-realurl": "^2.2", "dmitryd/typo3-realurl": "^2.2",
"apache-solr-for-typo3/solr": "^7.0", "apache-solr-for-typo3/solr": "^7.0",
...@@ -39,17 +35,15 @@ ...@@ -39,17 +35,15 @@
"nimut/testing-framework": "^2.0" "nimut/testing-framework": "^2.0"
}, },
"config": { "config": {
"bin-dir": "bin", "store-auths": false,
"store-auths": false "platform": {
"php": "7.0.30"
}
}, },
"extra": { "extra": {
"typo3/cms": { "typo3/cms": {
"web-dir": "html", "web-dir": "html",
"cms-package-dir": "{$vendor-dir}/typo3/cms" "cms-package-dir": "{$vendor-dir}/typo3/cms"
},
"helhum/typo3-console": {
"install-binary": true,
"install-extension-dummy": false
} }
}, },
"autoload": { "autoload": {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9fbd3964ec2220fd451bc8bbb8ee002f", "content-hash": "cfecbc0909fc8f9a5d9c2e0b156acde2",
"packages": [ "packages": [
{ {
"name": "adoy/fastcgi-client", "name": "adoy/fastcgi-client",
...@@ -2191,16 +2191,16 @@ ...@@ -2191,16 +2191,16 @@
}, },
{ {
"name": "typo3/cms", "name": "typo3/cms",
"version": "v8.7.15", "version": "v8.7.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/TYPO3/TYPO3.CMS.git", "url": "https://github.com/TYPO3/TYPO3.CMS.git",
"reference": "799725362be3d260d9b214dcdd8faa2525003724" "reference": "f02a014e16881b0271dda9a4a1a63ec9748b0210"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/799725362be3d260d9b214dcdd8faa2525003724", "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/f02a014e16881b0271dda9a4a1a63ec9748b0210",
"reference": "799725362be3d260d9b214dcdd8faa2525003724", "reference": "f02a014e16881b0271dda9a4a1a63ec9748b0210",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2392,7 +2392,7 @@ ...@@ -2392,7 +2392,7 @@
"extbase", "extbase",
"typo3" "typo3"
], ],
"time": "2018-05-23T11:31:21+00:00" "time": "2018-06-11T17:18:14+00:00"
}, },
{ {
"name": "typo3/cms-composer-installers", "name": "typo3/cms-composer-installers",
...@@ -3791,6 +3791,55 @@ ...@@ -3791,6 +3791,55 @@
"homepage": "https://github.com/sebastianbergmann/version", "homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00" "time": "2016-10-03T07:35:21+00:00"
}, },
{
"name": "typo3/minimal",
"version": "v8.7.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/minimal.git",
"reference": "41dcd9882b564bd6ea516cf0df11799c96033345"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/minimal/zipball/41dcd9882b564bd6ea516cf0df11799c96033345",
"reference": "41dcd9882b564bd6ea516cf0df11799c96033345",
"shasum": ""
},
"require": {
"typo3/cms-backend": "^8.7.9",
"typo3/cms-core": "^8.7.9",
"typo3/cms-cshmanual": "^8.7.9",
"typo3/cms-extbase": "^8.7.9",
"typo3/cms-extensionmanager": "^8.7.9",
"typo3/cms-filelist": "^8.7.9",
"typo3/cms-fluid": "^8.7.9",
"typo3/cms-frontend": "^8.7.9",
"typo3/cms-install": "^8.7.9",
"typo3/cms-lang": "^8.7.9",
"typo3/cms-recordlist": "^8.7.9",
"typo3/cms-saltedpasswords": "^8.7.9",
"typo3/cms-sv": "^8.7.9"
},
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"authors": [
{
"name": "The TYPO3 Community",
"homepage": "https://typo3.org/community/",
"role": "Contributor"
},
{
"name": "TYPO3 CMS Core Team",
"homepage": "https://forge.typo3.org/projects/typo3cms-core",
"role": "Developer"
}
],
"description": "Minimal required set of TYPO3 extensions",
"time": "2017-12-31T14:28:41+00:00"
},
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
"version": "1.2.0", "version": "1.2.0",
...@@ -3850,5 +3899,8 @@ ...@@ -3850,5 +3899,8 @@
"platform": { "platform": {
"php": ">=7.0" "php": ">=7.0"
}, },
"platform-dev": [] "platform-dev": [],
"platform-overrides": {
"php": "7.0.30"
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment