From 0e92471bd86def64238d14839f709d859e3628e9 Mon Sep 17 00:00:00 2001
From: navneet0693 <navneetsingh0693@gmail.com>
Date: Mon, 6 Jun 2022 11:49:34 +0530
Subject: [PATCH] Updated docker ci compose file.

1. Used php 8.0.19 which is latest bug fix version of PHP available in travis.
2. Changed ci images to be temporarilty based on temporary D9 based images created for testing.
---
 .travis.yml                  | 10 ++++++++--
 composer.json                |  4 ++--
 docker-compose-ci.yml        | 10 ++++++----
 docker-compose.blackfire.yml | 22 ++++++++++------------
 docker-compose.yml           |  6 ++++--
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82d3d5593..798c79c88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: focal
 sudo: required
 
 cache:
@@ -14,12 +14,18 @@ addons:
 language: php
 
 php:
-  - 8.0
+  - 8.0.19
+
+env:
+  global:
+    # Travis Token.
+    secure: "u6jLZiftQdb8Ozxngu5sgwmnXeUyvNF3/Y+5eX3+Xyb7Sm6K++cBLbYl/zNbuzp1rZE5dn3pVTQc4tstVXZw2B5KjCd64r9HE9gdwCEnS/AA/w3wGlaEBinTzKOrrN1EvqNNhnJUY2JmqEYVom+UYwLZWIIKM/5OoaeidNqHDvImZZLAeYfPMGnySsFC01yCzrOn6jv8Bwu00dQPVEOQylVEV5qgdGYz6CvGGslcvGxhvR0qdY/IXhrA0yxIk1yA6vu1mQpCSjGpPLy024JhcqRr3AzjH2N0QRKlL7vcNFxl/OC0qcK2bOl8lcQydeC5LRp92eeCLfMfvqHDqLJKvebCsvaZSmqlzCURlcHaJOM5bce7XPVyNLdwnfppgSacocGol38qxfEc09qV4AZnklwigYCfnk346oSaocKApy48KRW4cNXL45U7+z10IzVAENGwbyyuwdvKHhDtMCgMd8eeYfRF5EvENOKVSG02Kca8X2fLBhmJsXkFcBEW7pSRZKxixkIkuAwEYSQW/lvvM4LJmd2np7vZDEMh1dmf7TBRBygDVmM7vtdYRSzivR/T9nH+mXPP9FcjVvlPPeWAEaqtLPmmONmYRjDRcoHjJh3YnSMpvVs8wejDf7iS6A44cI6xZQRoEoCFA/WUu5EnzmoOCY7HvZ62xnZ0I9nNyL4="
 
 services:
   - docker
 
 before_install:
+  - set -e
   # Composer Configurations.
   - export COMPOSER_MEMORY_LIMIT=-1 # Set php memory limit to -1 so composer update will not fail
   - export COMPOSER_EXIT_ON_PATCH_FAILURE=1 # To enforce throwing an error and stopping package installation/update immediately
diff --git a/composer.json b/composer.json
index be1e3d54a..0f0fa044d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,8 @@
         "blackfire/php-sdk": "^v1.27.1",
         "drupal/redis": "^1.5",
         "drush/drush": "11.*@stable",
-        "goalgorilla/open_social": "dev-main",
-        "goalgorilla/open_social_scripts": "^3.0"
+        "goalgorilla/open_social": "dev-feature/3260861-php-8-support-updated-branch",
+        "goalgorilla/open_social_scripts": "^3.1"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "~0.7.1",
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 7ac4bb656..9d5d9aa4b 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -1,8 +1,10 @@
+# See: https://docs.docker.com/compose/compose-file/
+# See: https://github.com/compose-spec/compose-spec/blob/master/spec.md
 version: "2"
 
 services:
   web_scripts:
-    image: goalgorilla/open_social_docker:ci
+    image: goalgorilla/open_social_docker:cid9
     volumes:
       - ./:/var/www:delegated
     depends_on:
@@ -12,7 +14,7 @@ services:
     container_name: social_ci_web_scripts
 
   web:
-    image: goalgorilla/open_social_docker:ci
+    image: goalgorilla/open_social_docker:cid9
     volumes:
       - ./:/var/www:delegated
     depends_on:
@@ -34,7 +36,7 @@ services:
     volumes:
       - db_data:/var/lib/mysql
     ports:
-      - "3307:3306"
+      - "3306"
     container_name: social_ci_db
     command: mysqld --max_allowed_packet=16M
 
@@ -62,7 +64,7 @@ services:
     container_name: social_ci_selenium
 
   behat:
-    image: goalgorilla/open_social_docker:ci
+    image: goalgorilla/open_social_docker:cid9
     volumes:
       - ./:/var/www:delegated
     depends_on:
diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml
index 9137c5d80..6717d14fd 100644
--- a/docker-compose.blackfire.yml
+++ b/docker-compose.blackfire.yml
@@ -1,11 +1,9 @@
-version: "2"
-
 services:
   web:
-    image: goalgorilla/open_social_docker:d9
+    image: goalgorilla/open_social_docker:devd9
     volumes:
      - ./:/var/www:delegated
-    links:
+    depends_on:
      - db
      - mailcatcher
      - redis
@@ -46,8 +44,8 @@ services:
     image: selenium/standalone-firefox-debug:2.48.2
     volumes:
       - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated
-    links:
-     - web:web
+    depends_on:
+     - web
     ports:
      - "4444"
      - "5900"
@@ -58,13 +56,13 @@ services:
     container_name: social_selenium
 
   behat:
-    image: goalgorilla/open_social_docker:d9
+    image: goalgorilla/open_social_docker:devd9
     volumes:
      - ./:/var/www:delegated
-    links:
-     - web:web
-     - db:db
-     - selenium:selenium
+    depends_on:
+     - web
+     - db
+     - selenium
     environment:
      - DRUPAL_SETTINGS=development
     network_mode: "bridge"
@@ -85,7 +83,7 @@ services:
     image: goalgorilla/open_social_docker:cron
     volumes:
      - ./:/var/www
-    links:
+    depends_on:
      - db
      - mailcatcher
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 27d39a813..ee13278b4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,8 @@
+# See: https://docs.docker.com/compose/compose-file/
+# See: https://github.com/compose-spec/compose-spec/blob/master/spec.md
 services:
   web:
-    image: goalgorilla/open_social_docker:d9
+    image: goalgorilla/open_social_docker:devd9
     volumes:
       - ./:/var/www:delegated
     depends_on:
@@ -51,7 +53,7 @@ services:
     container_name: social_selenium
 
   behat:
-    image: goalgorilla/open_social_docker:d9
+    image: goalgorilla/open_social_docker:devd9
     volumes:
       - ./:/var/www:delegated
     depends_on: