From 2868704cf2405d260f4c5313c19d21ee51aabea4 Mon Sep 17 00:00:00 2001
From: Moshe Weitzman <weitzman@tejasa.com>
Date: Thu, 17 Oct 2024 10:36:31 -0400
Subject: [PATCH] Update image for mysql-rebuild job at CircleCI (#2712)

* Update image for mysql-rebuild job at CircleCI

* Add changelog

* Seems like --all is needed with newer docker-compose
---
 .circleci/config.yml    |  4 ++--
 changelogs/DP-35381.yml | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/DP-35381.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f50ef21d19..10b779eb89 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -699,7 +699,7 @@ jobs:
     working_directory: /home/circleci/code/.circleci/mysql-rebuild
     resource_class: << parameters.resource_class >>
     machine:
-      image: ubuntu-2004:202101-01
+      image: default
     steps:
       - attach_workspace: {at: /home/circleci}
       - fetch_drush_aliases:
@@ -720,7 +720,7 @@ jobs:
           no_output_timeout: 30m
       - run: docker-compose exec drupal drush cr
       - run: docker-compose stop --timeout 60 mysql
-      - run: docker commit $(docker-compose ps -q mysql) << parameters.instance >>
+      - run: docker commit $(docker-compose ps --all -q mysql) << parameters.instance >>
       - run: docker push << parameters.instance >>
 
   pending_security:
diff --git a/changelogs/DP-35381.yml b/changelogs/DP-35381.yml
new file mode 100644
index 0000000000..84b408c8e8
--- /dev/null
+++ b/changelogs/DP-35381.yml
@@ -0,0 +1,41 @@
+#
+# Write your changelog entry here. Every pull request must have a changelog yml file.
+#
+# Change types:
+# #############################################################################
+# You can use one of the following types:
+#  - Added: For new features.
+#  - Changed: For changes to existing functionality.
+#  - Deprecated: For soon-to-be removed features.
+#  - Removed: For removed features.
+#  - Fixed: For any bug fixes.
+#  - Security: In case of vulnerabilities.
+#
+# Format
+# #############################################################################
+# The format is crucial. Please follow the examples below. For reference, the requirements are:
+#  - All 3 parts are required and you must include "Type", "description" and "issue".
+#  - "Type" must be left aligned and followed by a colon.
+#  - "description" must be indented with 2 spaces followed by a colon
+#  - "issue" must be indented with 4 spaces followed by a colon.
+#  - "issue" is for the Jira ticket number only e.g. DP-1234
+#  - No extra spaces, indents, or blank lines are allowed.
+#
+# Example:
+# #############################################################################
+# Fixed:
+#  - description: Fixes scrolling on edit pages in Safari.
+#    issue: DP-13314
+#
+# You may add more than 1 description & issue for each type using the following format:
+# Changed:
+#  - description: Automating the release branch.
+#    issue: DP-10166
+#  - description: Second change item that needs a description.
+#    issue: DP-19875
+#  - description: Third change item that needs a description along with an issue.
+#    issue: DP-19843
+#
+Changed:
+  - description: CircleCI image for Mysql rebuild jobs
+    issue: DP-35381