Merge branch 'release/v2.2.2'

ahoy.changelog.yml

 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.
+    cmd: |
+      if [ "x$1" <> "x" ]; then
+        cd $1
+      fi
+      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 (or the given path as 1st argument) since the last release.

run/Dockerfile

@@ -23,8 +23,9 @@ RUN apk add --no-cache bash curl jq && \
     ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
     ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
     ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
-    wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
-    chmod +x /usr/local/bin/docker-compose && \
+    mkdir -p /usr/local/lib/docker/cli-plugins && \
+    curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
+    chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
     sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/run
 
 ENTRYPOINT /bin/sh

run/scripts/delete

@@ -32,7 +32,7 @@ function removenetwork() {
 function rebuildtraefik() {
   cd ${HOME}/.traefik || return
   if [[ -f "docker-compose.yml" ]]; then
-    docker-compose --project-name traefik up -d --remove-orphans
+    docker compose --project-name traefik up -d --remove-orphans
   fi
   if [[ "$NETWORKS" == "" ]]; then
     return

run/scripts/start

@@ -3,7 +3,7 @@
 function getConfig() {
   if [[ ! -n ${PHP_VERSION} ]]; then
     while true; do
-      read -p "Which PHP version is your project using? " PHP_VERSION
+      read -p "Which PHP version is your project using? [0=No, 1=Yes] " PHP_VERSION
       case ${PHP_VERSION} in
       7.0) break ;;
       7.1) break ;;
@@ -17,7 +17,7 @@ function getConfig() {
   fi
   if [[ ! -n ${COMPOSER_DOWNGRADE} ]]; then
     while true; do
-      read -p "Do you want to downgrade Composer to version 1? " COMPOSER_DOWNGRADE
+      read -p "Do you want to downgrade Composer to version 1? [0=No, 1=Yes] " COMPOSER_DOWNGRADE
       case ${COMPOSER_DOWNGRADE} in
       0) break ;;
       1) break ;;
@@ -30,6 +30,12 @@ function getConfig() {
   fi
 }
 
+function exitContainer() {
+  if [[ "$L3D_ALWAYS_CLEANUP" == "1" ]]; then
+    /usr/local/bin/.delete $COMPOSE_PROJECT_NAME
+  fi
+}
+
 function startContainer() {
   if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
     mode=REBUILD
@@ -93,6 +99,7 @@ function startContainer() {
           "${start_params[@]}" \
           registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} \
           /usr/local/bin/.start
+        exitContainer
         return
       fi
     fi
@@ -102,6 +109,7 @@ function startContainer() {
       --env SSHAUTH=${SSHAUTH} \
       ${COMPOSE_PROJECT_NAME}_l3d \
       /usr/local/bin/.start
+    exitContainer
   fi
 }
 

start.sh

@@ -94,8 +94,8 @@ function create {
 
       # Cleanup
       if [[ $L3D_CLEANUP -eq 1 ]]; then
-        docker-compose stop
-        docker-compose rm --force -v
+        docker compose stop
+        docker compose rm --force -v
       fi
     fi
   fi
@@ -259,7 +259,3 @@ if [[ -x "${L3DSHELL}" ]]; then
 else
   /usr/bin/fish
 fi
-
-if [[ "$L3D_ALWAYS_CLEANUP" == "1" ]]; then
-  /usr/local/bin/.delete $COMPOSE_PROJECT_NAME
-fi