Skip to content

Commit

Permalink
Merge branch 'develop' into feature/webhook-notification
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSkrypnyk committed Apr 29, 2024
2 parents 241e435 + ddc20de commit 5168715
Show file tree
Hide file tree
Showing 10 changed files with 107 additions and 95 deletions.
15 changes: 6 additions & 9 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,15 @@ commands:

cli:
usage: Start a shell or run a command inside the CLI service container.
# Drop into shell if no arguments were supplied.
# If arguments were supplied - a new shell will be started with environment
# variables passed from the host environment and filtered by prefix.
# This allows passing the host environment variables to a container without
# the need to restart it.
# Escape double quotes with \" (slash double-quote) when passing arguments
# containing spaces.
# Drop into a shell if no arguments are supplied, otherwise run the command.
# Environment variables are passed from the host and filtered by prefix.
# Use \" (slash followed by a double quote) to escape double quotes in
# arguments that contain spaces.
cmd: |
if [ "${#}" -ne 0 ]; then
docker compose exec $(env | cut -f1 -d= | grep "TERM\|COMPOSE_\|GITHUB_\|DOCKER_\DRUPAL_\|DREVOPS_" | sed 's/^/-e /') -T cli bash -c "$*"
docker compose exec $(env | cut -f1 -d= | grep "TERM\|COMPOSE_\|GITHUB_\|DOCKER_\|DRUPAL_\|DREVOPS_" | sed 's/^/-e /') -T cli bash -c "$*"
else
docker compose exec $(env | cut -f1 -d= | grep "TERM\|COMPOSE_\|GITHUB_\|DOCKER_\DRUPAL_\|DREVOPS_" | sed 's/^/-e /') cli bash
docker compose exec $(env | cut -f1 -d= | grep "TERM\|COMPOSE_\|GITHUB_\|DOCKER_\|DRUPAL_\|DREVOPS_" | sed 's/^/-e /') cli bash
fi
composer:
Expand Down
2 changes: 1 addition & 1 deletion .scaffold/docs/.utils/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "drevops/docs-utils",
"require": {
"php": ">=8.1",
"alexskrypnyk/shellvar": "^0.7"
"alexskrypnyk/shellvar": "^1"
},
"authors": [
{
Expand Down
50 changes: 25 additions & 25 deletions .scaffold/docs/.utils/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5168715

Please sign in to comment.