From b8c3052eaaa9272995afa8d843958843aa38e373 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Thu, 7 Jan 2021 10:21:12 +0100 Subject: [PATCH] docker/l3d#41 Add support for ahoy scripts even in blank project and provide changelog extract as a first command --- Dockerfile | 1 + ahoy.changelog.yml | 5 +++++ start.sh | 15 +++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 ahoy.changelog.yml diff --git a/Dockerfile b/Dockerfile index 7d876e4..006e13f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ ADD config.fish /etc/fish/ ADD start.sh /usr/local/bin/.start ADD configIdea.sh /usr/local/bin/.configIdea ADD l3dComposer.php /usr/local/bin/.l3dComposer.php +ADD ahoy.changelog.yml /usr/local/bin/.ahoy.changelog.yml ADD run/scripts/info /usr/local/bin/l3d ADD run/scripts/version /usr/local/bin/version ADD run/scripts/l3dnewversion /usr/local/bin/l3dnewversion diff --git a/ahoy.changelog.yml b/ahoy.changelog.yml new file mode 100644 index 0000000..481118f --- /dev/null +++ b/ahoy.changelog.yml @@ -0,0 +1,5 @@ +ahoyapi: v2 +commands: + extract: + cmd: git log $(git describe --tags `git rev-list --tags --max-count=1`)..HEAD --oneline | cut -d' ' -f 2-999 + usage: Extract changelog from Git for the current project since the last release. diff --git a/start.sh b/start.sh index b9c6683..834c421 100755 --- a/start.sh +++ b/start.sh @@ -188,6 +188,20 @@ function initialSetup { done } +function setupAhoy { + if [[ ! -f .ahoy.yml ]]; then + echo "ahoyapi: v2" >.ahoy.yml + echo "commands:" >.ahoy.yml + fi + EXISTING=$(cat .ahoy.yml | grep "^ changelog:") + if [[ ! -n ${EXISTING} ]]; then + echo " changelog:" >.ahoy.yml + echo " imports:" >.ahoy.yml + echo " - /usr/local/bin/.ahoy.changelog.yml" >.ahoy.yml + echo " usage: Changelog tools." >.ahoy.yml + fi +} + readEnv # Validate PHP version INSTALLED_PHP_VERSION=$(php -r "echo(substr(phpversion(),0,3));") @@ -212,6 +226,7 @@ else l3dComposer fi +setupAhoy if [[ -d /drupal/.idea ]]; then /usr/local/bin/.configIdea fi -- GitLab