From bee4b0c53c7cfd381adfb135a978f8d379b49bdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:39:08 +0100 Subject: [PATCH 1/8] Bump twig/twig from 2.16.1 to 3.11.2 in /generator (#530) Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.16.1 to 3.11.2. - [Changelog](https://github.com/twigphp/Twig/blob/v3.11.2/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.16.1...v3.11.2) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- generator/composer.json | 2 +- generator/composer.lock | 154 +++++++++++++++++++++------------------- 2 files changed, 82 insertions(+), 74 deletions(-) diff --git a/generator/composer.json b/generator/composer.json index d29dcd1df..b26605889 100644 --- a/generator/composer.json +++ b/generator/composer.json @@ -4,7 +4,7 @@ "license": "MIT", "require": { "symfony/yaml": "^4.3", - "twig/twig": "^2.11", + "twig/twig": "^3.11", "spatie/url": "^1.3", "symfony/console": "^5.3", "illuminate/collections": "^8.70", diff --git a/generator/composer.lock b/generator/composer.lock index 43242bc01..12323cf0e 100644 --- a/generator/composer.lock +++ b/generator/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "61d3af88d86839cc4c11d732a4d5dc87", + "content-hash": "ad0a6e1289805c544ca9ee9933ead50e", "packages": [ { "name": "illuminate/collections", @@ -509,16 +509,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "80d075412b557d41002320b96a096ca65aa2c98d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d", "shasum": "" }, "require": { @@ -527,7 +527,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -556,7 +556,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" }, "funding": [ { @@ -572,7 +572,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2023-01-24T14:02:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -899,29 +899,43 @@ "time": "2024-09-09T11:45:10+00:00" }, { - "name": "symfony/polyfill-php72", - "version": "v1.31.0", + "name": "symfony/polyfill-php73", + "version": "v1.23.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", - "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.1" }, - "type": "metapackage", + "type": "library", "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -936,7 +950,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -945,7 +959,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, "funding": [ { @@ -961,42 +975,39 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { - "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "name": "symfony/polyfill-php80", + "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1006,6 +1017,10 @@ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -1015,7 +1030,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -1024,7 +1039,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -1040,42 +1055,39 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "name": "symfony/polyfill-php81", + "version": "v1.31.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1085,10 +1097,6 @@ "MIT" ], "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -1098,7 +1106,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -1107,7 +1115,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -1123,7 +1131,7 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/service-contracts", @@ -1360,38 +1368,38 @@ }, { "name": "twig/twig", - "version": "v2.16.1", + "version": "v3.11.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "19185947ec75d433a3ac650af32fc05649b95ee1" + "reference": "5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/19185947ec75d433a3ac650af32fc05649b95ee1", - "reference": "19185947ec75d433a3ac650af32fc05649b95ee1", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1", + "reference": "5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.8" + "symfony/polyfill-php80": "^1.22", + "symfony/polyfill-php81": "^1.29" }, "require-dev": { - "psr/container": "^1.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3" + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.16-dev" - } - }, "autoload": { - "psr-0": { - "Twig_": "lib/" - }, + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], "psr-4": { "Twig\\": "src/" } @@ -1424,7 +1432,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.16.1" + "source": "https://github.com/twigphp/Twig/tree/v3.11.2" }, "funding": [ { @@ -1436,7 +1444,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T17:53:56+00:00" + "time": "2024-11-06T18:50:16+00:00" } ], "packages-dev": [ From 71652fd9eea8b80ac4fd5aeb06c6bb969e1b577c Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Mon, 11 Nov 2024 17:15:02 +0100 Subject: [PATCH 2/8] Mutagen v0.18.* check (#531) * Mutagen v0.18.* check * Added Os check * Wrap the whole check --- bin/command/install/bootstrap.sh | 1 + bin/environment/mutagen-version-check.sh | 22 ++++++++++++++++++++++ docs/09-troubleshooting.md | 12 +++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 bin/environment/mutagen-version-check.sh diff --git a/bin/command/install/bootstrap.sh b/bin/command/install/bootstrap.sh index 4926506fc..34ebe8000 100644 --- a/bin/command/install/bootstrap.sh +++ b/bin/command/install/bootstrap.sh @@ -4,6 +4,7 @@ require docker import environment/docker.sh import environment/docker-compose.sh +import environment/mutagen-version-check.sh Registry::addCommand "boot" "Command::bootstrap" Registry::addCommand "bootstrap" "Command::bootstrap" diff --git a/bin/environment/mutagen-version-check.sh b/bin/environment/mutagen-version-check.sh new file mode 100644 index 000000000..58f91d992 --- /dev/null +++ b/bin/environment/mutagen-version-check.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +function Environment::checkMutagenVersion() { + if [[ "${_PLATFORM}" == "macos" ]]; then + local mutagenInstalledVersion="$(Mutagen::getInstalledVersion)" + + if [[ "$mutagenInstalledVersion" == 0.18.* || "$mutagenInstalledVersion" > "0.18" ]]; then + Console::error "Error: Mutagen version 0.18.* is not supported yet. Please, run the command to install the latest supported version. + brew unlink mutagen && brew unlink mutagen-compose && brew install mutagen-io/mutagen/mutagen@0.17 mutagen-io/mutagen/mutagen-compose@0.17" + exit 1 + fi + fi +} + +function Mutagen::getInstalledVersion() { + echo $(String::trimWhitespaces "$( + command -v mutagen >/dev/null 2>&1 + test $? -eq 0 && mutagen version + )") +} + +Registry::addChecker "Environment::checkMutagenVersion" diff --git a/docs/09-troubleshooting.md b/docs/09-troubleshooting.md index 39031adfc..1398f3ccc 100644 --- a/docs/09-troubleshooting.md +++ b/docs/09-troubleshooting.md @@ -391,7 +391,7 @@ $config[SchedulerJenkinsConstants::JENKINS_CONFIGURATION] = [ ``` **when** -Assets install error +Assets install error ```bash line 1: run-s: not found ``` @@ -400,3 +400,13 @@ line 1: run-s: not found 1. ensure you are using latest docker-sdk and spryker/php image. 2. run `docker/sdk pull` 3. run `docker/sdk boot {{your deploy file}} && docker/sdk up --build` + + +**when** +Installation error with Mutagen v0.18.* +```bash +unable to bring up Mutagen Compose sidecar service: Error response from daemon: network is ambiguous (5 matches found based on ID prefix) +``` + +**then** +brew unlink mutagen && brew unlink mutagen-compose && brew install mutagen-io/mutagen/mutagen@0.17 mutagen-io/mutagen/mutagen-compose@0.17 From fc0a17b6eabc5efcc9e7a330b8f2e7473cd05007 Mon Sep 17 00:00:00 2001 From: Denys Sirchenko <74709265+DenysSirchenko@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:49:20 +0200 Subject: [PATCH 3/8] Updated trivy.yml and trufflehog.yml GHA workflows (#534) --- .github/workflows/trivy.yml | 4 +++- .github/workflows/trufflehog.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index d91a8687b..4408cb5a9 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -2,7 +2,9 @@ name: Trivy Security Scan on: push: branches: - - '*' # Triggers on pushes to all branches + - master + pull_request: + jobs: trivy-secrets-scan: runs-on: ubuntu-latest diff --git a/.github/workflows/trufflehog.yml b/.github/workflows/trufflehog.yml index 78ec24937..482aa8330 100644 --- a/.github/workflows/trufflehog.yml +++ b/.github/workflows/trufflehog.yml @@ -2,7 +2,9 @@ name: Trufflehog Security Scan on: push: branches: - - '*' # Triggers on pushes to all branches + - master + pull_request: + jobs: trufflehog-vulnerability-detection: runs-on: ubuntu-latest From ad894a70aad294f37781b1c362957822500f061c Mon Sep 17 00:00:00 2001 From: Alexey Kravchenko <42177964+kraal-spryker@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:01:07 +0200 Subject: [PATCH 4/8] CC-34832: moved generation of customer remember me secret do docker generator (#536) --- generator/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/generator/index.php b/generator/index.php index 554bfadc4..250465e47 100644 --- a/generator/index.php +++ b/generator/index.php @@ -1320,6 +1320,7 @@ function buildSecrets(string $deploymentDir): array $data['SPRYKER_URI_SIGNER_SECRET_KEY'] = generateToken(80); $data['SPRYKER_PRODUCT_CONFIGURATOR_ENCRYPTION_KEY'] = generateToken(10); $data['SPRYKER_PRODUCT_CONFIGURATOR_HEX_INITIALIZATION_VECTOR'] = generateRandomHex(16); + $data['SPRYKER_CUSTOMER_REMEMBER_ME_SECRET'] = generateToken(10); return $data; } From 47580745d141814196b6c92e4b7dcf533788dc6d Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Wed, 4 Dec 2024 15:50:52 +0700 Subject: [PATCH 5/8] Push ECR images in parallel (#529) * Push ECR images in parallel * Update ecr.sh --- bin/sdk/images/baked/ecr.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/sdk/images/baked/ecr.sh b/bin/sdk/images/baked/ecr.sh index 7931bfc83..3d0446102 100644 --- a/bin/sdk/images/baked/ecr.sh +++ b/bin/sdk/images/baked/ecr.sh @@ -49,16 +49,18 @@ function Images::push() { for application in "${SPRYKER_APPLICATIONS[@]}"; do local application="$(echo "$application" | tr '[:upper:]' '[:lower:]')" echo "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-${application}:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-${application}:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-${application}:latest" + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-${application}:${tag}" & + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-${application}:latest" & done echo "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-frontend:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-frontend:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-frontend:latest" + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-frontend:${tag}" & + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-frontend:latest" & echo "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-jenkins:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-jenkins:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-jenkins:latest" + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-jenkins:${tag}" & + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-jenkins:latest" & echo "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-pipeline:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-pipeline:${tag}" - docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-pipeline:latest" + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-pipeline:${tag}" & + docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${SPRYKER_PROJECT_NAME}-pipeline:latest" & + + wait } From 48fc0c184b661f8a66ecfbad866a44c29efbabaa Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Thu, 5 Dec 2024 15:50:42 +0700 Subject: [PATCH 6/8] SC-21893: Shebang is not platform agnostic (#538) Co-authored-by: Valerii Trots --- bin/command/build/baked/build.sh | 2 +- bin/command/build/baked/export.sh | 2 +- bin/command/build/mount/build.sh | 2 +- bin/command/build/mount/export.sh | 2 +- bin/command/build/pull.sh | 2 +- bin/command/cli/cli.sh | 2 +- bin/command/cli/console.sh | 2 +- bin/command/cli/testing.sh | 2 +- bin/command/compose/down.sh | 2 +- bin/command/compose/exec.sh | 2 +- bin/command/compose/ps.sh | 2 +- bin/command/compose/restart.sh | 2 +- bin/command/compose/run.sh | 2 +- bin/command/compose/stop.sh | 2 +- bin/command/compose/up.sh | 2 +- bin/command/deploy.sh | 2 +- bin/command/help.sh | 2 +- bin/command/install/bootstrap.sh | 2 +- bin/command/install/clean.sh | 2 +- bin/command/install/config.sh | 2 +- bin/command/install/install.sh | 2 +- bin/command/install/reset.sh | 2 +- bin/command/internal/prune.sh | 2 +- bin/command/internal/sync.sh | 2 +- bin/command/internal/trouble.sh | 2 +- bin/command/runtime/clean-data.sh | 2 +- bin/command/runtime/demo.sh | 2 +- bin/command/runtime/jobs.sh | 2 +- bin/command/runtime/logs.sh | 2 +- bin/command/runtime/wait.sh | 2 +- bin/command/uknown.sh | 2 +- bin/environment/check-directories.sh | 2 +- bin/environment/composer.sh | 2 +- bin/environment/cross-platform.sh | 2 +- bin/environment/docker-compose.sh | 2 +- bin/environment/docker.sh | 2 +- bin/environment/get-real-project-path.sh | 2 +- bin/framework.sh | 2 +- bin/installer/autoload-cache.sh | 2 +- bin/installer/hosts.sh | 2 +- bin/installer/jenkins-template.sh | 2 +- bin/installer/nfs.sh | 2 +- bin/lib/bool.sh | 2 +- bin/lib/string.sh | 2 +- bin/lib/version.sh | 2 +- bin/platform.sh | 2 +- bin/registry/command.sh | 2 +- bin/registry/flow.sh | 2 +- bin/registry/help.sh | 2 +- bin/registry/installer.sh | 2 +- bin/registry/require.sh | 2 +- bin/registry/trap.sh | 2 +- bin/sdk/assets/baked.sh | 2 +- bin/sdk/assets/mount.sh | 2 +- bin/sdk/codebase/baked.sh | 2 +- bin/sdk/codebase/mount.sh | 2 +- bin/sdk/compose.sh | 2 +- bin/sdk/data/demo.sh | 2 +- bin/sdk/images/baked.sh | 2 +- bin/sdk/images/baked/ecr.sh | 2 +- bin/sdk/images/common.sh | 2 +- bin/sdk/images/mount.sh | 2 +- bin/sdk/mount/baked.sh | 2 +- bin/sdk/mount/docker-sync.sh | 2 +- bin/sdk/mount/mutagen.sh | 2 +- bin/sdk/mount/native.sh | 2 +- bin/sdk/mount/nfs.sh | 2 +- bin/sdk/runtime/wait.sh | 2 +- bin/sentinels/autoload/autoload.sh | 2 +- bin/service/broker/rabbitmq.sh | 2 +- bin/service/database/mysql.sh | 2 +- bin/service/database/postgres.sh | 2 +- bin/service/scheduler/jenkins.sh | 2 +- bin/service/service.sh | 2 +- bin/standalone/cli.sh | 2 +- bin/standalone/console.sh | 2 +- bin/standalone/constants.sh | 2 +- bin/standalone/logo/spryker-cli.sh | 2 +- bin/standalone/logo/spryker-sdk.sh | 2 +- ci/tests.sh | 2 +- ci/tests/registry/trap/chech-remove.case.sh | 2 +- ci/tests/registry/trap/check-edge.case.sh | 2 +- ci/tests/registry/trap/check-on-exit.case.sh | 2 +- ci/tests/registry/trap/check-release.case.sh | 2 +- ci/tests/registry/trap/trap.test.sh | 2 +- context/jenkins/export/entrypoint.sh | 2 +- context/jenkins/spryker.sh | 2 +- generator/openssl/generate.sh | 2 +- generator/src/templates/deploy.bash.twig | 2 +- sdk | 2 +- 90 files changed, 90 insertions(+), 90 deletions(-) diff --git a/bin/command/build/baked/build.sh b/bin/command/build/baked/build.sh index 28754a4be..15a591ef3 100644 --- a/bin/command/build/baked/build.sh +++ b/bin/command/build/baked/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "build" "Command::build" diff --git a/bin/command/build/baked/export.sh b/bin/command/build/baked/export.sh index fafe5d109..c227a4cfd 100644 --- a/bin/command/build/baked/export.sh +++ b/bin/command/build/baked/export.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "export" "Command::export" diff --git a/bin/command/build/mount/build.sh b/bin/command/build/mount/build.sh index e37686ce5..65a2c8c7b 100644 --- a/bin/command/build/mount/build.sh +++ b/bin/command/build/mount/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "build" "Command::build" diff --git a/bin/command/build/mount/export.sh b/bin/command/build/mount/export.sh index c2e91f65a..b95991498 100644 --- a/bin/command/build/mount/export.sh +++ b/bin/command/build/mount/export.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "export" "Command::export" diff --git a/bin/command/build/pull.sh b/bin/command/build/pull.sh index 5c3596ea7..8816886e8 100644 --- a/bin/command/build/pull.sh +++ b/bin/command/build/pull.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "pull" "Command::pull" diff --git a/bin/command/cli/cli.sh b/bin/command/cli/cli.sh index 7377e65cb..d4c262fff 100644 --- a/bin/command/cli/cli.sh +++ b/bin/command/cli/cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "cli" "Command::cli" diff --git a/bin/command/cli/console.sh b/bin/command/cli/console.sh index d0e5991cc..0b9988459 100644 --- a/bin/command/cli/console.sh +++ b/bin/command/cli/console.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "console" "Command::console" diff --git a/bin/command/cli/testing.sh b/bin/command/cli/testing.sh index 04eb08dbc..802cf8174 100644 --- a/bin/command/cli/testing.sh +++ b/bin/command/cli/testing.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "testing" "Command::testing" diff --git a/bin/command/compose/down.sh b/bin/command/compose/down.sh index e8064e111..4bdfb201f 100644 --- a/bin/command/compose/down.sh +++ b/bin/command/compose/down.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "down" "Command::down" diff --git a/bin/command/compose/exec.sh b/bin/command/compose/exec.sh index bdbce0c29..ceb2f63da 100644 --- a/bin/command/compose/exec.sh +++ b/bin/command/compose/exec.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "exec" "Command::exec" diff --git a/bin/command/compose/ps.sh b/bin/command/compose/ps.sh index 5b08df7fa..d925cec3d 100644 --- a/bin/command/compose/ps.sh +++ b/bin/command/compose/ps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "ps" "Command::ps" diff --git a/bin/command/compose/restart.sh b/bin/command/compose/restart.sh index b0e9c11d1..8ea0c3f97 100644 --- a/bin/command/compose/restart.sh +++ b/bin/command/compose/restart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "restart" "Command::restart" diff --git a/bin/command/compose/run.sh b/bin/command/compose/run.sh index b11ddc6b2..865913d57 100644 --- a/bin/command/compose/run.sh +++ b/bin/command/compose/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "run" "Command::run" Registry::addCommand "start" "Command::run" diff --git a/bin/command/compose/stop.sh b/bin/command/compose/stop.sh index 3d71f0ca3..b4dd02a61 100644 --- a/bin/command/compose/stop.sh +++ b/bin/command/compose/stop.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "stop" "Command::stop" diff --git a/bin/command/compose/up.sh b/bin/command/compose/up.sh index cbf7bcb9a..90313341b 100644 --- a/bin/command/compose/up.sh +++ b/bin/command/compose/up.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "up" "Command::up" diff --git a/bin/command/deploy.sh b/bin/command/deploy.sh index d5e2f03fa..83287d3c7 100644 --- a/bin/command/deploy.sh +++ b/bin/command/deploy.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::Help::section "Usage in runtime:" Registry::Help::command -s -a " [-vxt]" diff --git a/bin/command/help.sh b/bin/command/help.sh index 1a7b60808..4795b54d8 100644 --- a/bin/command/help.sh +++ b/bin/command/help.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "help" "Command::help" Registry::addCommand "" "Command::help" diff --git a/bin/command/install/bootstrap.sh b/bin/command/install/bootstrap.sh index 34ebe8000..4fb748f12 100644 --- a/bin/command/install/bootstrap.sh +++ b/bin/command/install/bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require docker diff --git a/bin/command/install/clean.sh b/bin/command/install/clean.sh index b31cc3ac7..22f9075f2 100644 --- a/bin/command/install/clean.sh +++ b/bin/command/install/clean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "clean" "Command::clean" diff --git a/bin/command/install/config.sh b/bin/command/install/config.sh index e34738968..1e78cbee4 100644 --- a/bin/command/install/config.sh +++ b/bin/command/install/config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "config" "Command::config" diff --git a/bin/command/install/install.sh b/bin/command/install/install.sh index 5041e8dcc..01442f80c 100644 --- a/bin/command/install/install.sh +++ b/bin/command/install/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "install" "Command::install" diff --git a/bin/command/install/reset.sh b/bin/command/install/reset.sh index d51be71b6..4e50c0dab 100644 --- a/bin/command/install/reset.sh +++ b/bin/command/install/reset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "reset" "Command::reset" diff --git a/bin/command/internal/prune.sh b/bin/command/internal/prune.sh index cf6f13fdc..2fdb2a4c2 100644 --- a/bin/command/internal/prune.sh +++ b/bin/command/internal/prune.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "prune" "Command::prune" Registry::Help::command -c "prune [--f] [--a]" "Remove all docker data(images, volume, system and builder) and project artifacts." diff --git a/bin/command/internal/sync.sh b/bin/command/internal/sync.sh index 152accdd7..326aafd02 100644 --- a/bin/command/internal/sync.sh +++ b/bin/command/internal/sync.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "sync" "Command::sync" diff --git a/bin/command/internal/trouble.sh b/bin/command/internal/trouble.sh index e226ec8a7..093117a46 100644 --- a/bin/command/internal/trouble.sh +++ b/bin/command/internal/trouble.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "trouble" "Command::trouble" diff --git a/bin/command/runtime/clean-data.sh b/bin/command/runtime/clean-data.sh index 80c333202..117dfb27d 100644 --- a/bin/command/runtime/clean-data.sh +++ b/bin/command/runtime/clean-data.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "clean-data" "Command::clean-data" diff --git a/bin/command/runtime/demo.sh b/bin/command/runtime/demo.sh index 640d5817e..c6e7c8fab 100644 --- a/bin/command/runtime/demo.sh +++ b/bin/command/runtime/demo.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "demo" "Command::demo" Registry::addCommand "demo-data" "Command::demo" diff --git a/bin/command/runtime/jobs.sh b/bin/command/runtime/jobs.sh index 169e23395..ff9997c8c 100644 --- a/bin/command/runtime/jobs.sh +++ b/bin/command/runtime/jobs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "jobs" "Command::jobs" diff --git a/bin/command/runtime/logs.sh b/bin/command/runtime/logs.sh index cbebd1ba4..d1ccb27cf 100644 --- a/bin/command/runtime/logs.sh +++ b/bin/command/runtime/logs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "logs" "Command::logs" diff --git a/bin/command/runtime/wait.sh b/bin/command/runtime/wait.sh index 7428eed08..c04894ff8 100644 --- a/bin/command/runtime/wait.sh +++ b/bin/command/runtime/wait.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::addCommand "wait" "Command::wait" diff --git a/bin/command/uknown.sh b/bin/command/uknown.sh index 8d6895b2c..d1419fc8d 100644 --- a/bin/command/uknown.sh +++ b/bin/command/uknown.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Command::unknown() { local command=${1} diff --git a/bin/environment/check-directories.sh b/bin/environment/check-directories.sh index 9dd365b8c..84de34cc6 100644 --- a/bin/environment/check-directories.sh +++ b/bin/environment/check-directories.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Environment::checkDirectories() { local projectDirectoryPath="${1:-$(pwd)}" diff --git a/bin/environment/composer.sh b/bin/environment/composer.sh index 50de02692..046b83e00 100644 --- a/bin/environment/composer.sh +++ b/bin/environment/composer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Environment::Composer() { diff --git a/bin/environment/cross-platform.sh b/bin/environment/cross-platform.sh index c98cfeedc..f7ee3c696 100644 --- a/bin/environment/cross-platform.sh +++ b/bin/environment/cross-platform.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Environment::crossPlatform() { export XARGS_NO_RUN_IF_EMPTY=$(echo '' | xargs echo "--no-run-if-empty") diff --git a/bin/environment/docker-compose.sh b/bin/environment/docker-compose.sh index 07f6c7695..e264b498f 100644 --- a/bin/environment/docker-compose.sh +++ b/bin/environment/docker-compose.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export COMPOSE_HTTP_TIMEOUT=400 export COMPOSE_CONVERT_WINDOWS_PATHS=1 diff --git a/bin/environment/docker.sh b/bin/environment/docker.sh index 020e064a0..0281a4388 100644 --- a/bin/environment/docker.sh +++ b/bin/environment/docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export DOCKER_BUILDKIT=1 diff --git a/bin/environment/get-real-project-path.sh b/bin/environment/get-real-project-path.sh index 139dca8fe..b44313060 100755 --- a/bin/environment/get-real-project-path.sh +++ b/bin/environment/get-real-project-path.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Environment::getRealProjectPath() { local projectPath=${PROJECT_DIR:-$(pwd)} diff --git a/bin/framework.sh b/bin/framework.sh index ee0a8aa66..2aa4a161e 100644 --- a/bin/framework.sh +++ b/bin/framework.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e shopt -s extglob expand_aliases diff --git a/bin/installer/autoload-cache.sh b/bin/installer/autoload-cache.sh index 9a7724a52..994aff057 100644 --- a/bin/installer/autoload-cache.sh +++ b/bin/installer/autoload-cache.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require node npm diff --git a/bin/installer/hosts.sh b/bin/installer/hosts.sh index a8e3154e7..d380af4d0 100644 --- a/bin/installer/hosts.sh +++ b/bin/installer/hosts.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/bin/installer/jenkins-template.sh b/bin/installer/jenkins-template.sh index 0a9de5fe8..6b2dbde70 100644 --- a/bin/installer/jenkins-template.sh +++ b/bin/installer/jenkins-template.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Installer::jenkins-template() { diff --git a/bin/installer/nfs.sh b/bin/installer/nfs.sh index b2b61ddae..c4de64b6f 100644 --- a/bin/installer/nfs.sh +++ b/bin/installer/nfs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash import environment/docker.sh import environment/get-real-project-path.sh diff --git a/bin/lib/bool.sh b/bin/lib/bool.sh index d79610bef..1eaac737b 100644 --- a/bin/lib/bool.sh +++ b/bin/lib/bool.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Bool::normalizeBashBool() { case "${1}" in diff --git a/bin/lib/string.sh b/bin/lib/string.sh index bbc376e67..9e47278ff 100644 --- a/bin/lib/string.sh +++ b/bin/lib/string.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function String::trimWhitespaces() { echo -n "${*}" | tr -d " /n/r" diff --git a/bin/lib/version.sh b/bin/lib/version.sh index 14165d25d..0c0992adb 100644 --- a/bin/lib/version.sh +++ b/bin/lib/version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require awk diff --git a/bin/platform.sh b/bin/platform.sh index 2cb7014d5..e7d2a2f62 100755 --- a/bin/platform.sh +++ b/bin/platform.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Platform::getPlatform() { local uname=$(uname) diff --git a/bin/registry/command.sh b/bin/registry/command.sh index c86fd523c..e3c98079b 100644 --- a/bin/registry/command.sh +++ b/bin/registry/command.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash declare -a COMMAND_FUNCTIONS diff --git a/bin/registry/flow.sh b/bin/registry/flow.sh index 75d826b47..7c939825b 100644 --- a/bin/registry/flow.sh +++ b/bin/registry/flow.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash declare -a FLOW_BOOT declare -a FLOW_BEFORE_UP diff --git a/bin/registry/help.sh b/bin/registry/help.sh index 1c375a9fe..2d3ecbbb4 100644 --- a/bin/registry/help.sh +++ b/bin/registry/help.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash Registry::require tr diff --git a/bin/registry/installer.sh b/bin/registry/installer.sh index 865015667..52de572cd 100644 --- a/bin/registry/installer.sh +++ b/bin/registry/installer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash declare -a INSTALLER_FUNCTIONS diff --git a/bin/registry/require.sh b/bin/registry/require.sh index aa574de5b..b1ae74b97 100644 --- a/bin/registry/require.sh +++ b/bin/registry/require.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash declare -a REQUIRE_CHECKERS declare -a REQUIRE_BINARIES diff --git a/bin/registry/trap.sh b/bin/registry/trap.sh index 16e8f6ca5..35ced3ceb 100644 --- a/bin/registry/trap.sh +++ b/bin/registry/trap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash declare -a TRAP_ON_EXIT diff --git a/bin/sdk/assets/baked.sh b/bin/sdk/assets/baked.sh index e7cefe137..4efebfa91 100755 --- a/bin/sdk/assets/baked.sh +++ b/bin/sdk/assets/baked.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Assets::export() { # deprecated diff --git a/bin/sdk/assets/mount.sh b/bin/sdk/assets/mount.sh index 439567e0b..9d7a60b3f 100644 --- a/bin/sdk/assets/mount.sh +++ b/bin/sdk/assets/mount.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Assets::export() { # nothing to do diff --git a/bin/sdk/codebase/baked.sh b/bin/sdk/codebase/baked.sh index 22c63e1fb..b8cd5e8cf 100644 --- a/bin/sdk/codebase/baked.sh +++ b/bin/sdk/codebase/baked.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Codebase::build() { return "${TRUE}" diff --git a/bin/sdk/codebase/mount.sh b/bin/sdk/codebase/mount.sh index 5ef8e1b1f..739b47dc5 100644 --- a/bin/sdk/codebase/mount.sh +++ b/bin/sdk/codebase/mount.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Codebase::build() { Console::verbose "${INFO}Building codebase${NC}" diff --git a/bin/sdk/compose.sh b/bin/sdk/compose.sh index b972a182d..15637cf27 100644 --- a/bin/sdk/compose.sh +++ b/bin/sdk/compose.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2155 diff --git a/bin/sdk/data/demo.sh b/bin/sdk/data/demo.sh index 358b61f97..28cf2da62 100644 --- a/bin/sdk/data/demo.sh +++ b/bin/sdk/data/demo.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Data::isLoaded() { Console::start "Checking is demo data loaded for ${SPRYKER_CURRENT_REGION}... " diff --git a/bin/sdk/images/baked.sh b/bin/sdk/images/baked.sh index a38ac6488..223d9b0c1 100644 --- a/bin/sdk/images/baked.sh +++ b/bin/sdk/images/baked.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash import sdk/images/common.sh diff --git a/bin/sdk/images/baked/ecr.sh b/bin/sdk/images/baked/ecr.sh index 3d0446102..b0cfa2ddb 100644 --- a/bin/sdk/images/baked/ecr.sh +++ b/bin/sdk/images/baked/ecr.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash import sdk/images/baked.sh diff --git a/bin/sdk/images/common.sh b/bin/sdk/images/common.sh index 411d0a184..81533e61e 100644 --- a/bin/sdk/images/common.sh +++ b/bin/sdk/images/common.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require docker diff --git a/bin/sdk/images/mount.sh b/bin/sdk/images/mount.sh index a9c047797..e055cb821 100644 --- a/bin/sdk/images/mount.sh +++ b/bin/sdk/images/mount.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash import sdk/images/common.sh diff --git a/bin/sdk/mount/baked.sh b/bin/sdk/mount/baked.sh index 2f3b9db25..42c165af2 100644 --- a/bin/sdk/mount/baked.sh +++ b/bin/sdk/mount/baked.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Mount::logs() { Console::error "This mount mode does not support logging." diff --git a/bin/sdk/mount/docker-sync.sh b/bin/sdk/mount/docker-sync.sh index aff1517ee..46eebcb36 100755 --- a/bin/sdk/mount/docker-sync.sh +++ b/bin/sdk/mount/docker-sync.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require docker docker-sync grep sed diff --git a/bin/sdk/mount/mutagen.sh b/bin/sdk/mount/mutagen.sh index a22cd7fda..defee8829 100644 --- a/bin/sdk/mount/mutagen.sh +++ b/bin/sdk/mount/mutagen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require docker grep awk diff --git a/bin/sdk/mount/native.sh b/bin/sdk/mount/native.sh index 2f3b9db25..42c165af2 100644 --- a/bin/sdk/mount/native.sh +++ b/bin/sdk/mount/native.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Mount::logs() { Console::error "This mount mode does not support logging." diff --git a/bin/sdk/mount/nfs.sh b/bin/sdk/mount/nfs.sh index 77b91bb9b..2462db745 100644 --- a/bin/sdk/mount/nfs.sh +++ b/bin/sdk/mount/nfs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash require docker diff --git a/bin/sdk/runtime/wait.sh b/bin/sdk/runtime/wait.sh index c9953e56e..403df8a4f 100644 --- a/bin/sdk/runtime/wait.sh +++ b/bin/sdk/runtime/wait.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Runtime::waitFor() { local target=${1} diff --git a/bin/sentinels/autoload/autoload.sh b/bin/sentinels/autoload/autoload.sh index 5865320f3..912b1133a 100644 --- a/bin/sentinels/autoload/autoload.sh +++ b/bin/sentinels/autoload/autoload.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Sentinel::Autoload::install() { echo 1 diff --git a/bin/service/broker/rabbitmq.sh b/bin/service/broker/rabbitmq.sh index 4394521bd..2f396b2cf 100644 --- a/bin/service/broker/rabbitmq.sh +++ b/bin/service/broker/rabbitmq.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Service::Broker::install() { if ! Service::isServiceExist broker; then diff --git a/bin/service/database/mysql.sh b/bin/service/database/mysql.sh index 7283c1c59..c998d098f 100644 --- a/bin/service/database/mysql.sh +++ b/bin/service/database/mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Database::checkConnection() { diff --git a/bin/service/database/postgres.sh b/bin/service/database/postgres.sh index 3fa3ad1e2..fb5369945 100644 --- a/bin/service/database/postgres.sh +++ b/bin/service/database/postgres.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Database::haveTables() { if ! Service::isServiceExist database; then diff --git a/bin/service/scheduler/jenkins.sh b/bin/service/scheduler/jenkins.sh index 321665c7f..c83f3cb5e 100644 --- a/bin/service/scheduler/jenkins.sh +++ b/bin/service/scheduler/jenkins.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Service::Scheduler::isInstalled() { if ! Service::isServiceExist scheduler; then diff --git a/bin/service/service.sh b/bin/service/service.sh index de6c9ba00..e521110b7 100755 --- a/bin/service/service.sh +++ b/bin/service/service.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function Service::isServiceExist() { local serviceName="${1}" diff --git a/bin/standalone/cli.sh b/bin/standalone/cli.sh index 76d9f654c..0666c38b9 100755 --- a/bin/standalone/cli.sh +++ b/bin/standalone/cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/bin/standalone/console.sh b/bin/standalone/console.sh index c3ac2c8bf..6aa9ec8e7 100755 --- a/bin/standalone/console.sh +++ b/bin/standalone/console.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash CONSOLE_STARTED="" diff --git a/bin/standalone/constants.sh b/bin/standalone/constants.sh index 270a1cd0f..91cf554f1 100755 --- a/bin/standalone/constants.sh +++ b/bin/standalone/constants.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2034 TRUE=0 diff --git a/bin/standalone/logo/spryker-cli.sh b/bin/standalone/logo/spryker-cli.sh index accb48a46..80976981d 100755 --- a/bin/standalone/logo/spryker-cli.sh +++ b/bin/standalone/logo/spryker-cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2164 pushd "${BASH_SOURCE%/*}" >/dev/null diff --git a/bin/standalone/logo/spryker-sdk.sh b/bin/standalone/logo/spryker-sdk.sh index 6690addde..27731ab9a 100755 --- a/bin/standalone/logo/spryker-sdk.sh +++ b/bin/standalone/logo/spryker-sdk.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2164 pushd "${BASH_SOURCE%/*}" >/dev/null diff --git a/ci/tests.sh b/ci/tests.sh index ec4b87060..fe9144977 100644 --- a/ci/tests.sh +++ b/ci/tests.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -a diff --git a/ci/tests/registry/trap/chech-remove.case.sh b/ci/tests/registry/trap/chech-remove.case.sh index 70c1fd5ca..0d40f73ee 100644 --- a/ci/tests/registry/trap/chech-remove.case.sh +++ b/ci/tests/registry/trap/chech-remove.case.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source bin/framework.sh diff --git a/ci/tests/registry/trap/check-edge.case.sh b/ci/tests/registry/trap/check-edge.case.sh index 8312d6432..f5cc9dd79 100644 --- a/ci/tests/registry/trap/check-edge.case.sh +++ b/ci/tests/registry/trap/check-edge.case.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source bin/framework.sh diff --git a/ci/tests/registry/trap/check-on-exit.case.sh b/ci/tests/registry/trap/check-on-exit.case.sh index 6d8ae84ff..8c59406b1 100644 --- a/ci/tests/registry/trap/check-on-exit.case.sh +++ b/ci/tests/registry/trap/check-on-exit.case.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source bin/framework.sh diff --git a/ci/tests/registry/trap/check-release.case.sh b/ci/tests/registry/trap/check-release.case.sh index 99eb3963d..6d4002534 100644 --- a/ci/tests/registry/trap/check-release.case.sh +++ b/ci/tests/registry/trap/check-release.case.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source bin/framework.sh diff --git a/ci/tests/registry/trap/trap.test.sh b/ci/tests/registry/trap/trap.test.sh index 164fba0ee..ead31a8ba 100644 --- a/ci/tests/registry/trap/trap.test.sh +++ b/ci/tests/registry/trap/trap.test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -a diff --git a/context/jenkins/export/entrypoint.sh b/context/jenkins/export/entrypoint.sh index f44f00602..b2244c512 100644 --- a/context/jenkins/export/entrypoint.sh +++ b/context/jenkins/export/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash HOST=localhost PORT=8080 diff --git a/context/jenkins/spryker.sh b/context/jenkins/spryker.sh index f1c20b8a7..72a4d7e1a 100644 --- a/context/jenkins/spryker.sh +++ b/context/jenkins/spryker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/generator/openssl/generate.sh b/generator/openssl/generate.sh index f1fb50753..a6de1e193 100644 --- a/generator/openssl/generate.sh +++ b/generator/openssl/generate.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e id export ALT_NAMES=$(printf "DNS:%s" "${@/%/,}" | sed -r "s/,$//g") diff --git a/generator/src/templates/deploy.bash.twig b/generator/src/templates/deploy.bash.twig index ab90262fd..515b9cd5a 100644 --- a/generator/src/templates/deploy.bash.twig +++ b/generator/src/templates/deploy.bash.twig @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # shellcheck disable=SC2034 set -e diff --git a/sdk b/sdk index fb373761a..a8476d8a1 100755 --- a/sdk +++ b/sdk @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e From 68282ec3894eb0de1726268d81285229c15fe671 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Thu, 5 Dec 2024 16:31:22 +0700 Subject: [PATCH 7/8] SC-21906: Jenkins 2.488 support (#539) Co-authored-by: Valerii Trots --- README.md | 3 ++- .../service/jenkins/2.488/jenkins.yml.twig | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 generator/src/templates/service/jenkins/2.488/jenkins.yml.twig diff --git a/README.md b/README.md index 5902503a4..dbd1b2474 100644 --- a/README.md +++ b/README.md @@ -83,11 +83,12 @@ For contribution guidelines, see [Code contribution guide](https://docs.spryker. | | | 7.6 | ✓ | | | | | 7.10 | ✓ | | | | opensearch | 1.3 | ✓ | | -| scheduler | jenkins | 2.176 | | | +| scheduler | jenkins | 2.176 | | | | | | 2.305 | ✓ | | | | | 2.324 | ✓ | | | | | 2.401 | ✓ | | | | | 2.442 | ✓ | | +| | | 2.488 | ✓ | | | webdriver | phantomjs | latest* | | | | | chromedriver | latest | ✓ | | | mail_catcher | mailhog | 1.0 | ✓ | | diff --git a/generator/src/templates/service/jenkins/2.488/jenkins.yml.twig b/generator/src/templates/service/jenkins/2.488/jenkins.yml.twig new file mode 100644 index 000000000..578502b36 --- /dev/null +++ b/generator/src/templates/service/jenkins/2.488/jenkins.yml.twig @@ -0,0 +1,18 @@ + {{ serviceName }}: + image: spryker/jenkins:2.488 + networks: + - private + labels: + 'spryker.app.name': scheduler + 'spryker.app.type': services + 'spryker.project': ${SPRYKER_DOCKER_PREFIX}:${SPRYKER_DOCKER_TAG} + healthcheck: + test: [ "CMD", "nc", "-z", "localhost", "8080" ] + interval: 10s + timeout: 5s + retries: 5 + environment: + JAVA_OPTS: '-Djenkins.model.Jenkins.debugMode=true -Djenkins.install.runSetupWizard=false -Xms128m -Xmx128m -Dhudson.security.csrf.GlobalCrumbIssuerConfiguration.DISABLE_CSRF_PROTECTION={{ serviceData['csrf-protection-enabled'] ? 'false' : 'true' }}' + volumes: + - {{ serviceName }}-{{ serviceData['engine'] }}-data:/var/jenkins_home:rw + - ${DEPLOYMENT_PATH}/context/jenkins/spryker.sh:/usr/bin/spryker.sh:rw From a3ce862343119167b4ea4dd4598a0675bb589203 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 07:44:25 +0100 Subject: [PATCH 8/8] Bump path-to-regexp and express in /context/dashboard (#540) Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.12 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.10 to 0.1.12 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v0.1.12) Updates `express` from 4.21.1 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- context/dashboard/package-lock.json | 22 ++++++++++++++-------- context/dashboard/package.json | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/context/dashboard/package-lock.json b/context/dashboard/package-lock.json index 41c1106a9..00a5602ca 100644 --- a/context/dashboard/package-lock.json +++ b/context/dashboard/package-lock.json @@ -14,7 +14,7 @@ "docker-loghose": "^1.6.5", "dockerode": "^3.3.1", "eol": "^0.9.1", - "express": "^4.21.1", + "express": "^4.21.2", "http-proxy-middleware": "^2.0.7", "path-parse": ">=1.0.7", "pug": "^3.0.3", @@ -878,9 +878,10 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -901,7 +902,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -916,6 +917,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/debug": { @@ -1591,9 +1596,10 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "license": "MIT" }, "node_modules/picomatch": { "version": "2.3.1", diff --git a/context/dashboard/package.json b/context/dashboard/package.json index c4d477f86..0d99a9590 100644 --- a/context/dashboard/package.json +++ b/context/dashboard/package.json @@ -9,7 +9,7 @@ "docker-loghose": "^1.6.5", "dockerode": "^3.3.1", "eol": "^0.9.1", - "express": "^4.21.1", + "express": "^4.21.2", "http-proxy-middleware": "^2.0.7", "path-parse": ">=1.0.7", "pug": "^3.0.3",