.editorconfig

@@ -13,7 +13,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 # TS/JS-Files
-[*.{ts,js}]
+[*.{ts,js,es6}]
 indent_size = 2
 
 # JSON-Files
@@ -21,23 +21,14 @@ indent_size = 2
 indent_style = tab
 
 # ReST-Files
-[*.{rst,rst.txt}]
+[*.rst]
-indent_size = 4
+indent_size = 3
-max_line_length = 80
-
-# Markdown-Files
-[*.md]
 max_line_length = 80
 
 # YAML-Files
 [*.{yaml,yml}]
 indent_size = 2
 
-# NEON-Files
-[*.neon]
-indent_size = 2
-indent_style = tab
-
 # package.json
 [package.json]
 indent_size = 2

Classes/Config/Deployment.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Evoweb\DeployerConfig\Config;
 
+use Deployer\Deployer;
 use Deployer\Exception\Exception;
 use Evoweb\DeployerConfig\Tasks\Deploy;
 use Evoweb\DeployerConfig\Tasks\Local;
@@ -16,37 +17,38 @@ use function Deployer\import;
 use function Deployer\parse;
 use function Deployer\runLocally;
 use function Deployer\set;
+use function Deployer\Support\str_contains;
 use function Deployer\testLocally;
 use function Deployer\warning;
 
 class Deployment
 {
-    protected array $environmentVariables = [
-        'CI_PROJECT_DIR',
-        'CI_HOST',
-        'ENVIRONMENT',
-        'INSTANCE_ID'
-    ];
-
     public function __construct()
     {
         $this->loadDeployerCommon();
         $this->setDefaultConfiguration();
         $this->loadHostConfiguration();
         $this->registerTasks();
+
     }
 
     protected function loadDeployerCommon(): void
     {
-        $file = realpath(__DIR__ . '/../../../../deployer/deployer/recipe/common.php');
+        foreach (['/../../', '/../../../', '/../../../../'] as $path) {
-        if ($file && file_exists($file)) {
+            $file = realpath(__DIR__ . $path . 'vendor/deployer/deployer/recipe/common.php');
-            require $file;
+            if ($file && file_exists($file)) {
+                require $file;
+                break;
+            }
         }
     }
 
     protected function setDefaultConfiguration(): void
     {
-        array_walk($this->environmentVariables, fn ($variable) => $this->set($variable, getEnv($variable)));
+        $this->set('CI_PROJECT_DIR', getEnv('CI_PROJECT_DIR'));
+        $this->set('CI_HOST', getEnv('CI_HOST'));
+        $this->set('ENVIRONMENT_NAME', getEnv('ENVIRONMENT_NAME'));
+        $this->set('INSTANCE_ID', getEnv('INSTANCE_ID'));
 
         $this->set('app_container_path', '');
 
@@ -193,9 +195,12 @@ class Deployment
     protected function loadHostConfiguration(): void
     {
         // read configuration
-        $file = realpath(__DIR__ . '/../../../../../hosts.yaml');
+        foreach (['/../../../../', '/../../../../../'] as $path) {
-        if ($file && file_exists($file)) {
+            $file = realpath(__DIR__ . $path . $_ENV['ENVIRONMENT_NAME'] . '.yaml');
-            import($file);
+            if (file_exists($file)) {
+                import($file);
+                break;
+            }
         }
     }
 

Classes/Tasks/AbstractTasks.php

@@ -15,6 +15,7 @@ use ReflectionMethod;
 use function Deployer\get;
 use function Deployer\has;
 use function Deployer\set;
+use function Deployer\test;
 use function Deployer\testLocally;
 
 abstract class AbstractTasks
@@ -101,4 +102,26 @@ abstract class AbstractTasks
     {
         return $this->has($name) && is_array($this->get($name));
     }
+
+    protected function getApplicationContext(): string
+    {
+        return $this->has('application_context') ?
+            'TYPO3_CONTEXT="' . $this->get('application_context') . '" ' :
+            '';
+    }
+
+    protected function getSudo(): string
+    {
+        return $this->get('clear_use_sudo') ? 'sudo ' : '';
+    }
+
+    protected function getTYPO3Bin(string $path, string $testPath): string
+    {
+        if (test('[ -f ' . $testPath . '/releases/{{release_name}}/vendor/bin/typo3cms ]')) {
+            $bin = $path . '/releases/{{release_name}}/vendor/bin/typo3cms';
+        } else {
+            $bin = $path . '/releases/{{release_name}}/vendor/bin/typo3';
+        }
+        return $bin;
+    }
 }

Classes/Tasks/Deploy.php

@@ -21,6 +21,7 @@ class Deploy extends AbstractTasks
             'local:shared',
             'local:writable',
             'local:write_release',
+            'local:create_folder',
             'local:vendors',
         ],
 
@@ -40,21 +41,17 @@ class Deploy extends AbstractTasks
             'local:unlock',
             'deploy:success',
         ],
-
-        'deploy' => [
-            'deploy:prepare',
-            'deploy:publish',
-        ]
     ];
 
-    protected function initializeTasks(): void
+    public function __construct()
     {
-        array_walk($this->tasks, [$this, 'registerTask']);
+        parent::__construct();
         $this->registerAfterTask();
     }
 
     protected function registerAfterTask(): void
     {
+        // [Optional] if deploy fails automatically unlock.
         after('deploy:failed', 'local:unlock');
     }
 }

Classes/Tasks/Local.php

@@ -34,6 +34,7 @@ class Local extends AbstractTasks
         'local:shared',
         'local:writable',
         'local:write_release',
+        'local:create_folder',
         'local:vendors',
         'local:clear_paths',
         'local:symlink',
@@ -87,6 +88,15 @@ class Local extends AbstractTasks
         }
     }
 
+    /**
+     * Unlocks deploy
+     */
+    public function unlock(): void
+    {
+        // always success
+        runLocally("rm -f {{deploy_path}}/.dep/deploy.lock");
+    }
+
     /**
      * Prepares release
      */
@@ -163,11 +173,43 @@ class Local extends AbstractTasks
             throw new ConfigurationException("Missing 'repository' configuration.");
         }
 
+        $targetWithDir = $target;
+        if (!empty(get('sub_directory'))) {
+            $targetWithDir .= ':{{sub_directory}}';
+        }
+
+        $bare = parse('{{deploy_path}}/.dep/repo');
+        $env = [
+            'GIT_TERMINAL_PROMPT' => '0',
+            'GIT_SSH_COMMAND' => get('git_ssh_command'),
+        ];
+
+        start:
+        // Clone the repository to a bare repo.
+        runLocally("[ -d $bare ] || mkdir -p $bare");
+        runLocally("[ -f $bare/HEAD ] || $git clone --mirror $repository $bare 2>&1", ['env' => $env]);
+
+        // If remote url changed, drop `.dep/repo` and reinstall.
+        if (runLocally("cd $bare; $git config --get remote.origin.url") !== $repository) {
+            runLocally("rm -rf {{deploy_path}}$bare");
+            goto start;
+        }
+
+        runLocally("$git remote update 2>&1", ['env' => $env]);
+
         // Copy to release_path.
-        runLocally("cd {{release_path}}; $git clone --branch $target $repository .");
+        if (get('update_code_strategy') === 'archive') {
+            runLocally("cd $bare; $git archive $targetWithDir | tar -x -f - -C {{release_path}} 2>&1");
+        } elseif (get('update_code_strategy') === 'clone') {
+            runLocally("cd {{release_path}}; $git clone -l $bare .");
+            runLocally("cd {{release_path}}; $git remote set-url origin $repository", ['env' => $env]);
+            runLocally("cd {{release_path}}; $git checkout --force $target");
+        } else {
+            throw new ConfigurationException(parse("Unknown `update_code_strategy` option: {{update_code_strategy}}."));
+        }
 
         // Save git revision in REVISION file.
-        $rev = escapeshellarg(runLocally("cd {{release_path}}; $git rev-list $target -1"));
+        $rev = escapeshellarg(runLocally("cd $bare; $git rev-list $target -1"));
         runLocally("echo $rev > {{release_path}}/REVISION");
     }
 
@@ -271,23 +313,21 @@ class Local extends AbstractTasks
             throw new \RuntimeException('Absolute path not allowed in config parameter `writable_dirs`.');
         }
 
-        $options = ['cwd' => $this->get('release_or_current_path')];
-
         // Create directories if they don't exist
-        runLocally("mkdir -p $dirs", $options);
+        runLocally("cd {{release_or_current_path}}; mkdir -p $dirs");
 
         if ($mode === 'chown') {
             $httpUser = get('http_user');
             // Change owner.
             // -L   traverse every symbolic link to a directory encountered
-            runLocally("$sudo chown -L $recursive $httpUser $dirs", $options);
+            runLocally("cd {{release_or_current_path}}; $sudo chown -L $recursive $httpUser $dirs");
         } elseif ($mode === 'chgrp') {
             // Change group ownership.
             // -L    traverse every symbolic link to a directory encountered
-            runLocally("$sudo chgrp -L $recursive {{http_group}} $dirs", $options);
+            runLocally("cd {{release_or_current_path}}; $sudo chgrp -L $recursive {{http_group}} $dirs");
-            runLocally("$sudo chmod $recursive g+rwx $dirs", $options);
+            runLocally("cd {{release_or_current_path}}; $sudo chmod $recursive g+rwx $dirs");
         } elseif ($mode === 'chmod') {
-            runLocally("$sudo chmod $recursive {{writable_chmod_mode}} $dirs", $options);
+            runLocally("cd {{release_or_current_path}}; $sudo chmod $recursive {{writable_chmod_mode}} $dirs");
         } elseif ($mode === 'acl') {
             $remoteUser = get('remote_user', false);
             if (empty($remoteUser)) {
@@ -297,7 +337,7 @@ class Local extends AbstractTasks
             if (strlen(runLocally("chmod --help | grep ugoa; true")) > 0) {
                 // Try OS-X specific setting of access-rights
 
-                runLocally("$sudo chmod g+w $dirs", $options);
+                runLocally("cd {{release_or_current_path}}; $sudo chmod g+w $dirs");
             } elseif ($this->commandExist('setfacl')) {
                 $setFaclUsers = "-m u:\"$httpUser\":rwX";
                 // Check if remote user exists, before adding it to setfacl
@@ -313,16 +353,16 @@ class Local extends AbstractTasks
                     $writeableDirs = get('writable_dirs');
                     foreach ($writeableDirs as $dir) {
                         // Check if ACL has been set or not
-                        $hasfacl = runLocally("getfacl -p $dir | grep \"^user:$httpUser:.*w\" | wc -l", $options);
+                        $hasfacl = runLocally("cd {{release_or_current_path}}; getfacl -p $dir | grep \"^user:$httpUser:.*w\" | wc -l");
                         // Set ACL for directory if it has not been set before
                         if (!$hasfacl) {
-                            runLocally("setfacl -L $recursive $setFaclUsers $dir", $options);
+                            runLocally("cd {{release_or_current_path}}; setfacl -L $recursive $setFaclUsers $dir");
-                            runLocally("setfacl -dL $recursive $setFaclUsers $dir", $options);
+                            runLocally("cd {{release_or_current_path}}; setfacl -dL $recursive $setFaclUsers $dir");
                         }
                     }
                 } else {
-                    runLocally("$sudo setfacl -L $recursive $setFaclUsers $dirs", $options);
+                    runLocally("cd {{release_or_current_path}}; $sudo setfacl -L $recursive $setFaclUsers $dirs");
-                    runLocally("$sudo setfacl -dL $recursive $setFaclUsers $dirs", $options);
+                    runLocally("cd {{release_or_current_path}}; $sudo setfacl -dL $recursive $setFaclUsers $dirs");
                 }
             } else {
                 $alias = currentHost()->getAlias();
@@ -331,12 +371,12 @@ class Local extends AbstractTasks
         } elseif ($mode === 'sticky') {
             // Changes the group of the files, sets sticky bit to the directories
             // and add the writable bit for all files
-            runLocally("for dir in $dirs;" .
+            runLocally("cd {{release_or_current_path}}; for dir in $dirs;" .
                 'do ' .
                 'chgrp -L -R {{http_group}} ${dir}; ' .
                 'find ${dir} -type d -exec chmod g+rwxs \{\} \;;' .
                 'find ${dir} -type f -exec chmod g+rw \{\} \;;' .
-                'done', $options);
+                'done');
         } elseif ($mode === 'skip') {
             // Does nothing, saves time if no changes are required for some environments
             return;
@@ -350,6 +390,24 @@ class Local extends AbstractTasks
         runLocally('echo {{target}} > {{release_path}}/release');
     }
 
+    /**
+     * Creating necessary folders
+     */
+    public function createFolder(): void
+    {
+        $sudo = $this->getSudo();
+
+        if (testLocally('[ ! -d {{release_path}}/var/cache ]')) {
+            runLocally('mkdir -p {{release_path}}/var/cache');
+        }
+        runLocally($sudo . ' chmod -R 775 {{release_path}}/var/cache');
+
+        if (testLocally('[ ! -d {{release_path}}/var/log ]')) {
+            runLocally('mkdir -p {{release_path}}/var/log');
+        }
+        runLocally($sudo . ' chmod -R 775 {{release_path}}/var/log');
+    }
+
     /**
      * Installing vendors
      */
@@ -425,13 +483,4 @@ class Local extends AbstractTasks
     {
         info('Folder of this release is: {{release_path}}');
     }
-
-    /**
-     * Unlocks deploy
-     */
-    public function unlock(): void
-    {
-        // always success
-        runLocally("rm -f {{deploy_path}}/.dep/deploy.lock");
-    }
 }

Classes/Tasks/Remote.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Evoweb\DeployerConfig\Tasks;
 
-use function Deployer\currentHost;
 use function Deployer\get;
 use function Deployer\parse;
 use function Deployer\run;
@@ -159,29 +158,8 @@ class Remote extends AbstractTasks
      */
     public function clearOpcache(): void
     {
+        $webDomain = rtrim($this->get('web_domain'), '/');
         $htaccess = $this->has('htaccess') ? '--user ' . $this->get('htaccess') : '';
-        run('curl ' . $htaccess . ' -sk https://' . currentHost()->getAlias() . '/cache.php');
+        run('curl ' . $htaccess . ' -sk ' . $webDomain . '/cache.php');
-    }
-
-    protected function getSudo(): string
-    {
-        return $this->get('clear_use_sudo') ? 'sudo ' : '';
-    }
-
-    protected function getApplicationContext(): string
-    {
-        return $this->has('application_context') ?
-            'TYPO3_CONTEXT="' . $this->get('application_context') . '" ' :
-            '';
-    }
-
-    protected function getTYPO3Bin(string $path, string $testPath): string
-    {
-        if (test('[ -f ' . $testPath . '/releases/{{release_name}}/vendor/bin/typo3cms ]')) {
-            $bin = $path . '/releases/{{release_name}}/vendor/bin/typo3cms';
-        } else {
-            $bin = $path . '/releases/{{release_name}}/vendor/bin/typo3';
-        }
-        return $bin;
     }
 }

Classes/Tasks/Rsync.php

@@ -55,6 +55,8 @@ class Rsync extends AbstractTasks
 
         $this->set('rsync_default', $this->defaultConfig);
 
+        $this->set('rsync_src', '{{deploy_path}}');
+
         $this->set('rsync_dest', '{{user}}@{{hostname}}:\'{{remote_path}}/\'');
 
         $this->set('rsync_config', $this->rsyncConfig(...));
@@ -85,22 +87,18 @@ class Rsync extends AbstractTasks
         }
 
         if (testLocally('[ -d "{{deploy_path}}" ]')) {
-            $config = $this->get('rsync_config');
             $identityFile = $this->get('identity_file') ? ' -i ' . $this->get('identity_file') : '';
             runLocally(
-                '
+                'rsync \
-                    rsync \
+                -e \'ssh -p {{port}}' . $identityFile . '\' \
-                    -e "ssh -p {{port}}' . $identityFile . '" \
+                {{rsync_flags}} \
-                    {{rsync_flags}} \
+                {{rsync_options}} \
-                    {{rsync_options}} \
+                {{rsync_timeout}} \
-                    {{rsync_timeout}} \
+                 --exclude=' . escapeshellarg('shared') . ' \
-                     --exclude=' . escapeshellarg('shared') . ' \
+                {{rsync_excludes_download}} \
-                    {{rsync_excludes_download}} \
+                {{rsync_includes}} \
-                    {{rsync_includes}} \
+                {{rsync_filter}} \
-                    {{rsync_filter}} \
+                {{rsync_dest}} {{deploy_path}}'
-                    {{rsync_dest}} {{deploy_path}}
-                ',
-                $config
             );
         } else {
             warning('<comment>No destination folder found.</comment>');
@@ -112,22 +110,20 @@ class Rsync extends AbstractTasks
      */
     public function remote(): void
     {
+        $config = $this->get('rsync_config');
+        $identityFile = $this->get('identity_file') ? ' -i ' . $this->get('identity_file') : '';
         if (test('[ -d "{{remote_path}}" ]')) {
-            $config = $this->get('rsync_config');
-            $identityFile = $this->get('identity_file') ? ' -i ' . $this->get('identity_file') : '';
             runLocally(
-                '
+                'rsync \
-                    rsync \
+            -e \'ssh -p {{port}}' . $identityFile . '\' \
-                    -e "ssh -p {{port}}' . $identityFile . '" \
+            {{rsync_flags}} \
-                    {{rsync_flags}} \
+            {{rsync_options}} \
-                    {{rsync_options}} \
+            {{rsync_timeout}} \
-                    {{rsync_timeout}} \
+            {{rsync_includes}} \
-                    {{rsync_includes}} \
+            --exclude=' . escapeshellarg('shared/') . ' \
-                    --exclude=' . escapeshellarg('shared/') . ' \
+            {{rsync_excludes_upload}} \
-                    {{rsync_excludes_upload}} \
+            {{rsync_filter}} \
-                    {{rsync_filter}} \
+            \'{{rsync_src}}/\' {{user}}@{{hostname}}:\'{{remote_path}}/\'',
-                    {{deploy_path}}/ {{rsync_dest}}
-                ',
                 $config
             );
         } else {
@@ -143,13 +139,11 @@ class Rsync extends AbstractTasks
         $config = $this->get('rsync_config');
         $identityFile = $this->get('identity_file') ? ' -i ' . $this->get('identity_file') : '';
         runLocally(
-            '
+            'rsync \
-                rsync \
+                -e \'ssh -p {{port}}' . $identityFile . '\' \
-                -e "ssh -p {{port}}' . $identityFile . '" \
                 {{rsync_flags}} \
                 {{rsync_options}} \
-                {{deploy_path}}/current {{rsync_dest}}
+                \'{{rsync_src}}/current\' {{user}}@{{hostname}}:\'{{remote_path}}/\'',
-            ',
             $config
         );
     }

README.md

@@ -1,197 +1,85 @@
 ## To install add Build/composer.json to the project
 ```json
 {
-    "name": "ew/build",
+	"name": "cp/build",
-    "description": "Project deployment with utilization of deployphp",
+	"description": "Project deployment with support for deployphp",
-    "repositories": {
+	"repositories": [
-        "gitea": {
+		{
-            "type": "git",
+			"type": "git",
-            "url": "https://gitea.fischer.im/evoWeb/ew_deployer_config.git"
+			"url": "https://gitlab.cp-compartner.de/cpcompartner/build-config.git"
-        }
+		}
-    },
+	],
-    "require": {
+	"require": {
-        "evoweb/deployer-config": "dev-develop"
+		"cp/build-config": "^1.7.3"
-    }
+	},
+	"scripts": {
+		"staging": "dep -vv --file=vendor/cp/build-config/deploy.php deploy staging --branch",
+		"production": "dep --file=vendor/cp/build-config/deploy.php deploy production --tag",
+
+		"phpcs-fixer": "php-cs-fixer fix --config=vendor/cp/build-config/php_cs.php",
+		"phpstan": "phpstan analyse --configuration=vendor/cp/build-config/phpstan.neon",
+		"rector": "rector process --config=vendor/cp/build-config/rector.php",
+		"php72-lint": "find ../packages ../private/typo3conf -name '*.php' -exec php7.2 -l {} 1> /dev/null \\;",
+		"php74-lint": "find ../packages ../private/typo3conf -name '*.php' -exec php7.4 -l {} 1> /dev/null \\;"
+	}
 }
 ```
 
-## Add to Build/alias.sh with
+## Usage per composer
-```shell
-#!/bin/bash
 
-function composer() {
+Install it with:
-  mkdir -p "${HOME}/.config/composer"
+```bash
-  mkdir -p "${HOME}/.cache/composer"
+./composer update
-  docker run -t \
-    --user $(id -u):33 \
-    --env COMPOSER_CACHE_DIR=/cache \
-    --env SSH_AUTH_SOCK=/ssh-agent \
-    --env CI_HOST \
-    --env CI_PROJECT_DIR \
-    --env ENVIRONMENT \
-    --env INSTANCE_ID \
-    --env ADDITIONAL_CONFIG_FILE \
-    --env TYPO3_CONTEXT \
-    --env STAGE \
-    --network db \
-    --volume "$(readlink -f ${SSH_AUTH_SOCK})":/ssh-agent \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume "${HOME}":"${HOME}" \
-    --volume "${HOME}/.ssh/known_hosts":/home/.ssh-agent/known_hosts \
-    --volume "${HOME}/.config/composer":/tmp \
-    --volume "${HOME}/.cache/composer":/cache \
-    --volume "${CI_PROJECT_DIR}":"${CI_PROJECT_DIR}" \
-    --volume "${PWD%}":/app \
-  evoweb/php:composer $@
-}
-alias composer=composer
 ```
 
-## Add .env to project root
-```apacheconf
-ALIAS_SCRIPT=Build/alias.sh
-DEPLOY_CONFIG=Build/vendor/evoweb/deployer-config/deploy.php
-
-DOMAIN=www.evoweb.de
-CI_HOST=10.10.0.25
-INSTANCE_ID=website-evoweb
-HOST=sebastian@10.10.0.25
-PORT=22
-
-SHARED=/mnt/Docker/website-evoweb/shared
-```
-
-## Add Makefile to project root
-```makefile
-MAKEFLAGS += --warn-undefined-variables
-SHELL := /bin/bash
-.EXPORT_ALL_VARIABLES:
-.ONESHELL:
-.SHELLFLAGS := -eu -o pipefail -c
-.SILENT:
-
-# use the rest as arguments for "run"
-_ARGS := $(wordlist 2, $(words $(MAKECMDGOALS)), $(MAKECMDGOALS))
-# ...and turn them into do-nothing targets
-$(eval $(_ARGS):;@:)
-
-production-%: ENVIRONMENT=production
-production-%: TYPO3_CONTEXT=Production
-staging-%: ENVIRONMENT=staging
-staging-%: TYPO3_CONTEXT=Production/Staging
-
-MKFILE_PATH := $(realpath $(firstword $(MAKEFILE_LIST)))
-CI_PROJECT_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
-
-include $(CI_PROJECT_DIR)/.env
-
-TAG := $(shell git -C $(CI_PROJECT_DIR) describe --abbrev=0)
-BUILD_DIR := $(CI_PROJECT_DIR)/Build/
-ALIAS_FILE := $(CI_PROJECT_DIR)/$(ALIAS_SCRIPT)
-DEPLOY_FILE := $(CI_PROJECT_DIR)/$(DEPLOY_CONFIG)
-
-.PHONY: latest-tag
-latest-tag:
-	echo "Latest tag is: $(shell git -C $(CI_PROJECT_DIR) describe --abbrev=0)"
-
-.PHONY: --build-install
---build-install:
-	echo "Installed build tools started"
-	source $(ALIAS_FILE); \
-	composer --working-dir=$(BUILD_DIR) install
-	echo "Installed build tools finished"
-
-.PHONY: --release
---release:
-	echo "Release for $(ENVIRONMENT) with '$(TASK)' started"
-	source $(ALIAS_FILE); \
-	ENVIRONMENT="$(ENVIRONMENT)" \
-	composer --working-dir=$(BUILD_DIR) exec dep -- $(VERBOSE) --file=$(DEPLOY_FILE) $(TASK) environment=$(ENVIRONMENT)
-	echo "Release for $(ENVIRONMENT) with '$(TASK)' finished"
-
-##@
-##@ Commands to release tag or branch
-##@
-
-.PHONY: production-release
-production-release: ##@ Release latest tag to production
-production-release: TASK=deploy --tag $(TAG)
-production-release: VERBOSE=
-production-release: --build-install --release
-
-
-.PHONY: staging-release
-staging-release: ##@ Release develop to staging
-staging-release: TASK=deploy --branch develop
-staging-release: VERBOSE=-vv
-staging-release: --build-install --release
-```
-
-## Usage per make
-
 Deploy branch develop to staging
 ```bash
-make staging-release
+./composer staging develop
 ```
 
 Deploy tag 1.0.0 to production
 ```bash
-make production-release 1.0.0
+./composer production 1.0.0
+```
+
+PHPCS fixer usage:
+```bash
+./composer phpcs-fixer ../package/cp_sitepackage
+```
+
+PHPStan usage:
+```bash
+./composer phpstan ../package/cp_sitepackage
+```
+
+TYPO3 Rector usage:
+```bash
+./composer rector ../package/cp_sitepackage
 ```
 
 ## Overriding default values per host in hosts.yaml
 ```yaml
-# for more settings, look in https://github.com/deployphp/deployer/recipe/common.php
+.base: &base
-config:
+  local: true
-    bin/php: 'docker exec -e TYPO3_CONTEXT="{{application_context}}" $(docker ps -q -f name={{INSTANCE_ID}}-php-fpm-1) php'
+  alias: '{{CI_HOST}}'
-    http_user: sebastian
+  deploy_path: '{{CI_PROJECT_DIR}}/cache/{{ENVIRONMENT_NAME}}'
-    http_group: www-data
+  composer_options: '{{composer_action}} --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader --no-suggest --ignore-platform-reqs'
-    keep_releases: 5
 
-    remote_user: sebastian
+  prepare_dirs:
-    identity_file: ~/.ssh/rsync_id_ed25519
+    - .dep
-    deploy_path: '{{CI_PROJECT_DIR}}/Build/cache/{{ENVIRONMENT}}'
+    - releases
+    - shared/fileadmin
 
-    repository: git@gitea.fischer.im:evoWeb/website_evoweb_de.git
+  shared_dirs_private:
-    composer_options: '{{composer_action}} --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader --no-suggest --ignore-platform-reqs'
+    - fileadmin
 
-    prepare_dirs:
+  writable_dirs:
-        - .dep
+    - private/typo3temp
-        - releases
+    - var
-        - shared/public/fileadmin
+  writable_files:
-
+    - private/typo3conf/PackageStates.php
-    shared_dirs:
-        - public/fileadmin
-
-    writable_recursive: true
-    writable_dirs:
-        - public/typo3temp
-        - var
-        - var/cache
-        - var/log
-
-    rsync:
-        exclude_download:
-            - current
-            - shared/
-            - var/*
-            - '-,p public/typo3temp'
-
-    remote_path: /srv/{{INSTANCE_ID}}/data/htdocs/{{ENVIRONMENT}}
-    app_container_path: /usr/local/apache2/htdocs/{{ENVIRONMENT}}
-
-hosts:
-    staging.evoweb.de:
-        hostname: '{{CI_HOST}}'
-        labels:
-            environment: staging
-        application_context: Production/Staging
-        htaccess: evoweb:website
-
-    www.evoweb.de:
-        hostname: '{{CI_HOST}}'
-        labels:
-            environment: production
-        application_context: Production
 
+  rsync:
+    exclude:
+      - '-,p private/typo3temp/var/Cache'
 ```

alias.sh

@@ -9,7 +9,7 @@ function composer() {
     --env SSH_AUTH_SOCK=/ssh-agent \
     --env CI_HOST \
     --env CI_PROJECT_DIR \
-    --env ENVIRONMENT \
+    --env ENVIRONMENT_NAME \
     --env INSTANCE_ID \
     --env ADDITIONAL_CONFIG_FILE \
     --env TYPO3_CONTEXT \
@@ -18,7 +18,6 @@ function composer() {
     --volume "$(readlink -f ${SSH_AUTH_SOCK})":/ssh-agent \
     --volume /etc/passwd:/etc/passwd:ro \
     --volume "${HOME}":"${HOME}" \
-    --volume "${HOME}/.ssh/known_hosts":/home/.ssh-agent/known_hosts \
     --volume "${HOME}/.config/composer":/tmp \
     --volume "${HOME}/.cache/composer":/cache \
     --volume "${CI_PROJECT_DIR}":"${CI_PROJECT_DIR}" \

deploy.php

@@ -1,4 +1,4 @@
 <?php
 
-require(dirname(__DIR__) . '/../../vendor/autoload.php');
+$classLoader = require dirname(__DIR__) . '/../vendor/autoload.php';
 new \Evoweb\DeployerConfig\Config\Deployment();