Merge pull request #21 from govCMS/release/2.0.0

Release 2.0.0

.gitlab-ci.yml

@@ -1,14 +1,14 @@
 image: gitlab-registry-production.govcms.amazee.io/govcms/govcms-ci:latest
 services:
-  - gitlab-registry-production.govcms.amazee.io/govcms/govcms-ci/dind:latest
+  - name: gitlab-registry-production.govcms.amazee.io/govcms/govcms-ci/dind:latest
+    command: ["--tls=false"]
 
 stages:
   - build
 
 build:
   stage: build
   script:
-    - printenv
     - IMAGE_TAG=$([ $CI_COMMIT_BRANCH = 'master' ] && echo 'latest' || echo 'edge')
     - scripts/prepare
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

composer.json

@@ -17,7 +17,7 @@
     ],
     "minimum-stability": "alpha",
     "require": {
-        "govcms/scaffold-tooling": "~2",
+        "govcms/scaffold-tooling": "~3",
         "symfony/yaml": "~5",
         "symfony/console": "~5"
     },

govcms-ci.Dockerfile

@@ -27,7 +27,7 @@ RUN curl -L -o "/tmp/shellcheck-v0.7.1.tar.xz" "https://github.com/koalaman/shel
   && chmod +x /usr/bin/shellcheck
 
 # Install BATS.
-RUN apk update && apk add --no-cache bats
+RUN apk add --no-cache bats=1.3.0-r0 --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/main
 
 # Required for docker-compose to find zlib.
 ENV LD_LIBRARY_PATH=/lib:/usr/lib
@@ -78,5 +78,5 @@ RUN git --version \
 
 COPY composer.json /govcms/
 ENV COMPOSER_MEMORY_LIMIT=-1
-RUN composer install -d /govcms && composer cc
+RUN composer self-update --1 && composer install -d /govcms && composer cc
 ENV PATH="/govcms/vendor/bin:${PATH}"

scripts/prepare

@@ -5,6 +5,6 @@ echo "[---] CI_REGISTRY: ${CI_REGISTRY}"
 
 if [ "$CI_COMMIT_BRANCH" != "master" ]; then
   # Pin to the develop branch for scaffold-tooling.
-  sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-develop\2#g" composer.json
+  sed -i.bak -E "s#(\"govcms\/scaffold-tooling\":[[:space:]]*\").+(\")#\1dev-9.x-develop\2#g" composer.json
   echo "[---] Updated to govcms/scaffold-tooling:dev-develop"
 fi