Merge branch 'develop' into 'main'

Merge for new minor release

See merge request !12

.gitlab-ci.yml

@@ -5,7 +5,7 @@ include:
 
 variables:
   VERSION: ${CI_COMMIT_TAG}
-  CI_VERSION: v2.0.11
+  CI_VERSION: v2.0.12
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -14,8 +14,7 @@ setup:
   stage: build
   script:
     - docker build --pull --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/setup:${VERSION} ./setup
-    - docker build --pull --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/setup:latest ./setup
-    - docker push ${CI_REGISTRY_IMAGE}/setup:${VERSION}
+    - docker tag ${CI_REGISTRY_IMAGE}/setup:${VERSION} ${CI_REGISTRY_IMAGE}/setup:latest
     - docker push ${CI_REGISTRY_IMAGE}/setup:latest
   only:
     - tags
@@ -25,6 +24,8 @@ run:
   script:
     - docker build --pull --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/run:${VERSION} ./run
     - docker push ${CI_REGISTRY_IMAGE}/run:${VERSION}
+    - docker tag ${CI_REGISTRY_IMAGE}/run:${VERSION} ${CI_REGISTRY_IMAGE}/run:latest
+    - docker push ${CI_REGISTRY_IMAGE}/run:latest
   only:
     - tags
 
@@ -36,5 +37,7 @@ php:
   script:
     - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
     - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
+    - docker tag ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} ${CI_REGISTRY_IMAGE}/php-${PHP}:latest
+    - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:latest
   only:
     - tags

Dockerfile

@@ -36,8 +36,11 @@ RUN echo "Install dorgflow" && \
     chmod +x gitflow-installer.sh && \
     ./gitflow-installer.sh install stable && \
     rm gitflow-installer.sh && \
-    \
     sed -i -e "s/readlink -e/echo/g" /usr/local/bin/git-flow && \
     \
+    echo "Install" && \
+    curl -SL https://github.com/mglaman/drupalorg-cli/releases/download/0.3.3/drupalorg.phar -o /usr/local/bin/dorg-cli && \
+    chmod +x /usr/local/bin/dorg-cli && \
+    \
     rm -rf /var/cache/* && \
     rm -rf /root/.composer/cache

ahoy.changelog.yml

@@ -7,3 +7,10 @@ commands:
       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.
+  drupal:
+    cmd: |
+      if [ "x$1" != "x" ]; then
+        cd $1
+      fi
+      dorg-cli maintainer:release-notes $(gen-semver)
+    usage: Same as above but for a drupal.org project.

run/scripts/start

@@ -3,8 +3,8 @@
 function getConfig() {
   if [[ ! -n ${PHP_VERSION} ]]; then
     while true; do
-      DEFAULT=7.4
-      read -p "Which PHP version is your project using [7.1 - 7.4, 8.0 - 8.1]? " VALUE
+      DEFAULT=8.1
+      read -p "WhIich PHP version is your project using [7.1 - 7.4, 8.0 - 8.1]? " VALUE
       if [[ "x$VALUE" == "x" ]]; then
         PHP_VERSION=$DEFAULT
       else

setup/scripts/l3d

@@ -85,6 +85,14 @@ fi
 if [[ -f ".env" ]]; then
   export $(cat .env | xargs) > /dev/null 2>&1
 fi
+if [[ -f ".lakedrops.yml" ]]; then
+  V=$(yq eval .docker4drupal.php.version .lakedrops.yml)
+  if [[ "$V" != "null" ]]; then
+    PHP_VERSION=$V
+    echo "PHP_VERSION=${PHP_VERSION}" >>.env
+    env -i $(cat .env | xargs) >.env
+  fi
+fi
 
 # Create project container parameters
 project_params=(

start.sh

@@ -221,6 +221,9 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
   echo -e "\\033[31m ============================================= \\033[0m"
   echo -e "\\033[31m ERROR: PHP $INSTALLED_PHP_VERSION installed but $PHP_VERSION expected !!! \\033[0m"
   echo -e "\\033[31m ============================================= \\033[0m"
+  if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
+    docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d
+  fi
 fi
 if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
   composer self-update --1