[DEVOPS-394] Upgraded to docker compose v2.

.ahoy.yml

@@ -89,7 +89,6 @@ commands:
     usage: Pull latest docker images.
     cmd: docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep govcms/ | grep -v none | xargs -n1 docker pull | cat
 
-
   lint:
     usage: Lint code
     cmd: docker compose exec cli lint-govcms

.docker/images/nginx/tests/bootstrap.php

@@ -25,7 +25,7 @@ function get_curl_headers($path = '/', $opts = NULL) {
   $uri = $uri . '/' . ltrim($path, '/');
 
   $response = NULL;
-  exec("docker-compose exec -T test curl -s {$uri} -I {$opts} 2>&1", $response, $ret);
+  exec("docker compose exec -T test curl -s {$uri} -I {$opts} 2>&1", $response, $ret);
 
   if (is_debug()) {
     fwrite(STDERR, sprintf('CURL exit code : %s', $ret) . PHP_EOL);
@@ -75,7 +75,7 @@ function curl_get_content($path = '/', $opts = NULL) {
   $uri = $uri . '/' . ltrim($path, '/');
 
   $response = NULL;
-  exec("docker-compose exec -T test curl -s {$uri} {$opts} 2>&1", $response, $ret);
+  exec("docker compose exec -T test curl -s {$uri} {$opts} 2>&1", $response, $ret);
 
   if (is_debug()) {
     fwrite(STDERR, sprintf('CURL exit code : %s', $ret) . PHP_EOL);

.docker/images/nginx/tests/src/FilesCacheTest.php

@@ -10,10 +10,10 @@ class FilesCacheTest extends TestCase {
    * {@inheritdoc}
    */
   public function setUp(): void {
-    `docker-compose exec nginx mkdir -p /app/sites/default/files`;
+    `docker compose exec nginx mkdir -p /app/sites/default/files`;
     foreach ($this->providerExpiredHeaderPath() as $parts) {
       list($file, $path) = $parts;
-      `docker cp $path/$file $(docker-compose ps -q nginx):/app/web/sites/default/files/`;
+      `docker cp $path/$file $(docker compose ps -q nginx):/app/web/sites/default/files/`;
     }
   }
 

.docker/images/nginx/tests/src/PrivateFilesTest.php

@@ -14,11 +14,11 @@ class PrivateFilesTest extends TestCase {
    */
   public function setUp(): void {
     // Make sure private files directory exists in the nginx container.
-    `docker-compose exec nginx mkdir -p /app/web/sites/default/files/private`;
+    `docker compose exec nginx mkdir -p /app/web/sites/default/files/private`;
     foreach ($this->providerFileAccess() as $parts) {
       list($file, $path) = $parts;
       // Move out test files.
-      `docker cp $path/$file $(docker-compose ps -q nginx):/app/web/sites/default/files/private/`;
+      `docker cp $path/$file $(docker compose ps -q nginx):/app/web/sites/default/files/private/`;
     }
   }
 

.env.default

@@ -3,7 +3,7 @@
 #
 # It is used by Ahoy and other scripts to read default values.
 #
-# Copy this file to '.env' to make docker-compose use overridden values.
+# Copy this file to '.env' to make docker compose use overridden values.
 
 # Current site name. All containers will have this prefix.
 COMPOSE_PROJECT_NAME=govcmslagoon
@@ -35,7 +35,7 @@ X_FRAME_OPTIONS=SAMEORIGIN
 
 # Set the version of GovCMS and Drupal Core to use - you can use a tag or branch reference (3.x-dev) here
 # See https://github.com/govCMS/GovCMS/releases
-GOVCMS_PROJECT_VERSION=3.12.0
+GOVCMS_PROJECT_VERSION=3.14.0
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. 20.12.0)
 # See https://github.com/uselagoon/lagoon-images/releases

.gitlab-ci.yml

@@ -133,7 +133,7 @@ deploy:multiarch:
 validate:images:
   stage: validate
   script:
-    - docker-compose config -q
+    - docker compose config -q
 
 build:images:
   stage: build
@@ -151,7 +151,7 @@ info:modules:
   <<: *before_script_build
   script:
     - ahoy -v install -- install_configure_form.update_status_module='array(FALSE,FALSE)'
-    - docker-compose exec -T cli drush status
+    - docker compose exec -T cli drush status
     # @todo: 10.x support.
     #- /govcms/vendor/bin/govcms-module_verify
   only:

docker-compose.yml

@@ -69,7 +69,7 @@ services:
         LAGOON_IMAGE_VERSION: ${LAGOON_IMAGE_VERSION:-latest}
     image: ${DOCKERHUB_NAMESPACE:-govcms}/mariadb-drupal:${GOVCMS_RELEASE_TAG:-latest}
     ports:
-      - "3306" # Find port on host with `docker-compose port mariadb 3306`
+      - "3306" # Find port on host with `docker compose port mariadb 3306`
 
   redis:
     build:
@@ -89,7 +89,7 @@ services:
         LAGOON_IMAGE_VERSION: ${LAGOON_IMAGE_VERSION:-latest}
     image: ${DOCKERHUB_NAMESPACE:-govcms}/solr:${GOVCMS_RELEASE_TAG:-latest}
     ports:
-      - "8983" # Find port on host with `docker-compose port solr 8983`
+      - "8983" # Find port on host with `docker compose port solr 8983`
 
   varnish:
     build: