Skip to content

Commit fd2ae6a

Browse files
authored
Merge branch 'main' into docker-login
2 parents 12d8509 + 3073719 commit fd2ae6a

File tree

50 files changed

+503
-483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+503
-483
lines changed

.evergreen/start-atlas-cloud-cluster.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
RUN_ID="$(date +"%s")-$(git rev-parse --short HEAD)"
44
DELETE_AFTER="$(date -u -Iseconds -d '+2 hours' 2>/dev/null || date -u -Iseconds -v '+2H')"
5+
DOCKER_REGISTRY="${DOCKER_REGISTRY:-docker.io}"
56

67
# This script helps to automatically provision Atlas cluster for running the e2e
78
# tests against. In CI this will always create a new cluster and delete it when
@@ -39,8 +40,8 @@ DELETE_AFTER="$(date -u -Iseconds -d '+2 hours' 2>/dev/null || date -u -Iseconds
3940
# MCLI_ORG_ID Org ID
4041
# MCLI_PROJECT_ID Project ID
4142
#
42-
# COMPASS_E2E_ATLAS_CLOUD_SANDBOX_USERNAME Cloud user you created
43-
# COMPASS_E2E_ATLAS_CLOUD_SANDBOX_PASSWORD Cloud user password
43+
# COMPASS_E2E_ATLAS_CLOUD_SANDBOX_USERNAME Cloud user you created
44+
# COMPASS_E2E_ATLAS_CLOUD_SANDBOX_PASSWORD Cloud user password
4445
#
4546
# - Source the script followed by running the tests to make sure that some
4647
# variables exported from this script are available for the test env:
@@ -68,7 +69,7 @@ function atlascli() {
6869
-e MCLI_ORG_ID \
6970
-e MCLI_PROJECT_ID \
7071
-e MCLI_OPS_MANAGER_URL \
71-
mongodb/atlas atlas $@
72+
"$DOCKER_REGISTRY/mongodb/atlas" atlas $@
7273
}
7374

7475
cleanup() {

THIRD-PARTY-NOTICES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Thu Nov 14 2024.
2+
This document was automatically generated on Tue Nov 19 2024.
33

44
## List of dependencies
55

@@ -238,7 +238,7 @@ Package|Version|License
238238
**[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)**|1.1.1|MIT
239239
**[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)**|3.5.0|MIT
240240
**[electron-squirrel-startup](#09fb8168e8fda2e174f8d1a1c392ffd8f762c5637c788edd00d1e2486d060349)**|1.0.1|Apache-2.0
241-
**[electron](#45d9d716eba09c27895fc97918c48d7e8fd605bb2c2a291edd07aa512ebee800)**|32.2.3|MIT
241+
**[electron](#95b070aa09c824727d991b85b6b410b671792a0eb89ed3001cda13e3146f266f)**|32.2.5|MIT
242242
**[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)**|1.0.2|MIT
243243
**[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)**|2.0.0|MIT
244244
**[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)**|1.4.4|MIT
@@ -18732,8 +18732,8 @@ License files:
1873218732

1873318733

1873418734

18735-
<a id="45d9d716eba09c27895fc97918c48d7e8fd605bb2c2a291edd07aa512ebee800"></a>
18736-
### [electron](https://www.npmjs.com/package/electron) (version 32.2.3)
18735+
<a id="95b070aa09c824727d991b85b6b410b671792a0eb89ed3001cda13e3146f266f"></a>
18736+
### [electron](https://www.npmjs.com/package/electron) (version 32.2.5)
1873718737
License tags: MIT
1873818738

1873918739
License files:

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"cli-progress": "^3.9.1",
7474
"core-js": "^3.17.3",
7575
"css-loader": "^4.3.0",
76-
"electron": "^32.2.3",
76+
"electron": "^32.2.5",
7777
"html-webpack-plugin": "^5.6.0",
7878
"less": "^3.13.1",
7979
"less-loader": "^10.0.1",

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Compass Tracking Plan
33

4-
Generated on Thu, Nov 14, 2024 at 04:23 PM
4+
Generated on Tue, Nov 19, 2024 at 09:54 AM
55

66
## Table of Contents
77

0 commit comments

Comments
 (0)