Update mongo #13024
Merged
Update mongo #13024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/mongo@b149de1: Merge pull request docker-library/mongo#553 from infosiftr/add-6 - docker-library/mongo@8e7e80e: Update "latest" to the 6.0 series - docker-library/mongo@06b403b: Add 6.0 release - docker-library/mongo@39f62d0: Add Debian Bookworm and Ubuntu Jammy in versions.sh (both unused)
Diff for 67fbcbe:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e8a450f..c5b7d80 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -18,27 +18,27 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 4.0.28-windowsservercore-1809, 4.0-windowsservercore-1809
SharedTags: 4.0.28-windowsservercore, 4.0-windowsservercore, 4.0.28, 4.0
Architectures: windows-amd64
-GitCommit: 6f8fe0cc9b34501014d98834e386889facf6e392
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.0/windows/windowsservercore-1809
Constraints: windowsservercore-1809
Tags: 4.0.28-windowsservercore-ltsc2022, 4.0-windowsservercore-ltsc2022
SharedTags: 4.0.28-windowsservercore, 4.0-windowsservercore, 4.0.28, 4.0
Architectures: windows-amd64
-GitCommit: 6f8fe0cc9b34501014d98834e386889facf6e392
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.0/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
Tags: 4.0.28-xenial, 4.0-xenial
SharedTags: 4.0.28, 4.0
Architectures: amd64, arm64v8
-GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.0
Tags: 4.2.22-bionic, 4.2-bionic
SharedTags: 4.2.22, 4.2
Architectures: amd64, arm64v8
-GitCommit: d1db10ce166d2c4236e380995fce7f1472a92f44
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.2
Tags: 4.2.22-nanoserver-1809, 4.2-nanoserver-1809
@@ -58,21 +58,21 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 4.2.22-windowsservercore-1809, 4.2-windowsservercore-1809
SharedTags: 4.2.22-windowsservercore, 4.2-windowsservercore, 4.2.22, 4.2
Architectures: windows-amd64
-GitCommit: d1db10ce166d2c4236e380995fce7f1472a92f44
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.2/windows/windowsservercore-1809
Constraints: windowsservercore-1809
Tags: 4.2.22-windowsservercore-ltsc2022, 4.2-windowsservercore-ltsc2022
SharedTags: 4.2.22-windowsservercore, 4.2-windowsservercore, 4.2.22, 4.2
Architectures: windows-amd64
-GitCommit: d1db10ce166d2c4236e380995fce7f1472a92f44
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.2/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
Tags: 4.4.16-focal, 4.4-focal, 4-focal
SharedTags: 4.4.16, 4.4, 4
Architectures: amd64, arm64v8
-GitCommit: fdd183a654dd02dc4459063ccc7c9b3703fc54af
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.4
Tags: 4.4.16-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
@@ -92,47 +92,81 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 4.4.16-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
SharedTags: 4.4.16-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.16, 4.4, 4
Architectures: windows-amd64
-GitCommit: fdd183a654dd02dc4459063ccc7c9b3703fc54af
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.4/windows/windowsservercore-1809
Constraints: windowsservercore-1809
Tags: 4.4.16-windowsservercore-ltsc2022, 4.4-windowsservercore-ltsc2022, 4-windowsservercore-ltsc2022
SharedTags: 4.4.16-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.16, 4.4, 4
Architectures: windows-amd64
-GitCommit: fdd183a654dd02dc4459063ccc7c9b3703fc54af
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 4.4/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 5.0.11-focal, 5.0-focal, 5-focal, focal
-SharedTags: 5.0.11, 5.0, 5, latest
+Tags: 5.0.11-focal, 5.0-focal, 5-focal
+SharedTags: 5.0.11, 5.0, 5
Architectures: amd64, arm64v8
-GitCommit: 52c402d3744a806411b65e5fc843c65a87d8012c
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 5.0
-Tags: 5.0.11-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809, nanoserver-1809
-SharedTags: 5.0.11-nanoserver, 5.0-nanoserver, 5-nanoserver, nanoserver
+Tags: 5.0.11-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809
+SharedTags: 5.0.11-nanoserver, 5.0-nanoserver, 5-nanoserver
Architectures: windows-amd64
GitCommit: 52c402d3744a806411b65e5fc843c65a87d8012c
Directory: 5.0/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 5.0.11-nanoserver-ltsc2022, 5.0-nanoserver-ltsc2022, 5-nanoserver-ltsc2022, nanoserver-ltsc2022
-SharedTags: 5.0.11-nanoserver, 5.0-nanoserver, 5-nanoserver, nanoserver
+Tags: 5.0.11-nanoserver-ltsc2022, 5.0-nanoserver-ltsc2022, 5-nanoserver-ltsc2022
+SharedTags: 5.0.11-nanoserver, 5.0-nanoserver, 5-nanoserver
Architectures: windows-amd64
GitCommit: 52c402d3744a806411b65e5fc843c65a87d8012c
Directory: 5.0/windows/nanoserver-ltsc2022
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-Tags: 5.0.11-windowsservercore-1809, 5.0-windowsservercore-1809, 5-windowsservercore-1809, windowsservercore-1809
-SharedTags: 5.0.11-windowsservercore, 5.0-windowsservercore, 5-windowsservercore, windowsservercore, 5.0.11, 5.0, 5, latest
+Tags: 5.0.11-windowsservercore-1809, 5.0-windowsservercore-1809, 5-windowsservercore-1809
+SharedTags: 5.0.11-windowsservercore, 5.0-windowsservercore, 5-windowsservercore, 5.0.11, 5.0, 5
Architectures: windows-amd64
-GitCommit: 52c402d3744a806411b65e5fc843c65a87d8012c
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 5.0/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 5.0.11-windowsservercore-ltsc2022, 5.0-windowsservercore-ltsc2022, 5-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 5.0.11-windowsservercore, 5.0-windowsservercore, 5-windowsservercore, windowsservercore, 5.0.11, 5.0, 5, latest
+Tags: 5.0.11-windowsservercore-ltsc2022, 5.0-windowsservercore-ltsc2022, 5-windowsservercore-ltsc2022
+SharedTags: 5.0.11-windowsservercore, 5.0-windowsservercore, 5-windowsservercore, 5.0.11, 5.0, 5
Architectures: windows-amd64
-GitCommit: 52c402d3744a806411b65e5fc843c65a87d8012c
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
Directory: 5.0/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+
+Tags: 6.0.1-focal, 6.0-focal, 6-focal, focal
+SharedTags: 6.0.1, 6.0, 6, latest
+Architectures: amd64, arm64v8
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
+Directory: 6.0
+
+Tags: 6.0.1-nanoserver-1809, 6.0-nanoserver-1809, 6-nanoserver-1809, nanoserver-1809
+SharedTags: 6.0.1-nanoserver, 6.0-nanoserver, 6-nanoserver, nanoserver
+Architectures: windows-amd64
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
+Directory: 6.0/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 6.0.1-nanoserver-ltsc2022, 6.0-nanoserver-ltsc2022, 6-nanoserver-ltsc2022, nanoserver-ltsc2022
+SharedTags: 6.0.1-nanoserver, 6.0-nanoserver, 6-nanoserver, nanoserver
+Architectures: windows-amd64
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
+Directory: 6.0/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 6.0.1-windowsservercore-1809, 6.0-windowsservercore-1809, 6-windowsservercore-1809, windowsservercore-1809
+SharedTags: 6.0.1-windowsservercore, 6.0-windowsservercore, 6-windowsservercore, windowsservercore, 6.0.1, 6.0, 6, latest
+Architectures: windows-amd64
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
+Directory: 6.0/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 6.0.1-windowsservercore-ltsc2022, 6.0-windowsservercore-ltsc2022, 6-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 6.0.1-windowsservercore, 6.0-windowsservercore, 6-windowsservercore, windowsservercore, 6.0.1, 6.0, 6, latest
+Architectures: windows-amd64
+GitCommit: 06b403b869fc79cf176561a47e5ccebf97a42bad
+Directory: 6.0/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index c070557..905ea1c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -78,6 +78,30 @@ mongo:5.0.11-nanoserver-ltsc2022
mongo:5.0.11-windowsservercore
mongo:5.0.11-windowsservercore-1809
mongo:5.0.11-windowsservercore-ltsc2022
+mongo:6
+mongo:6-focal
+mongo:6-nanoserver
+mongo:6-nanoserver-1809
+mongo:6-nanoserver-ltsc2022
+mongo:6-windowsservercore
+mongo:6-windowsservercore-1809
+mongo:6-windowsservercore-ltsc2022
+mongo:6.0
+mongo:6.0-focal
+mongo:6.0-nanoserver
+mongo:6.0-nanoserver-1809
+mongo:6.0-nanoserver-ltsc2022
+mongo:6.0-windowsservercore
+mongo:6.0-windowsservercore-1809
+mongo:6.0-windowsservercore-ltsc2022
+mongo:6.0.1
+mongo:6.0.1-focal
+mongo:6.0.1-nanoserver
+mongo:6.0.1-nanoserver-1809
+mongo:6.0.1-nanoserver-ltsc2022
+mongo:6.0.1-windowsservercore
+mongo:6.0.1-windowsservercore-1809
+mongo:6.0.1-windowsservercore-ltsc2022
mongo:focal
mongo:latest
mongo:nanoserver
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_4-focal/docker-entrypoint.sh
index e2c5a52..2313c41 100755
--- a/mongo_4-focal/docker-entrypoint.sh
+++ b/mongo_4-focal/docker-entrypoint.sh
@@ -337,7 +337,12 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+ mongoShell='mongo'
+ if ! command -v "$mongoShell" > /dev/null; then
+ mongoShell='mongosh'
+ fi
+
+ mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_4-windowsservercore-1809/Dockerfile b/mongo_4-windowsservercore-1809/Dockerfile
index bee9784..59f6fb1 100644
--- a/mongo_4-windowsservercore-1809/Dockerfile
+++ b/mongo_4-windowsservercore-1809/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_4-windowsservercore-ltsc2022/Dockerfile b/mongo_4-windowsservercore-ltsc2022/Dockerfile
index 5622bb9..52e121d 100644
--- a/mongo_4-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4-windowsservercore-ltsc2022/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_4.0-windowsservercore-1809/Dockerfile b/mongo_4.0-windowsservercore-1809/Dockerfile
index 369ddcf..2ce54e5 100644
--- a/mongo_4.0-windowsservercore-1809/Dockerfile
+++ b/mongo_4.0-windowsservercore-1809/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,ImportExportTools,MiscellaneousTools,MonitoringTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_4.0-windowsservercore-ltsc2022/Dockerfile b/mongo_4.0-windowsservercore-ltsc2022/Dockerfile
index 2755f84..6a940ed 100644
--- a/mongo_4.0-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4.0-windowsservercore-ltsc2022/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,ImportExportTools,MiscellaneousTools,MonitoringTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_4.0-xenial/docker-entrypoint.sh b/mongo_4.0-xenial/docker-entrypoint.sh
index e2c5a52..2313c41 100755
--- a/mongo_4.0-xenial/docker-entrypoint.sh
+++ b/mongo_4.0-xenial/docker-entrypoint.sh
@@ -337,7 +337,12 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+ mongoShell='mongo'
+ if ! command -v "$mongoShell" > /dev/null; then
+ mongoShell='mongosh'
+ fi
+
+ mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_4.2-bionic/docker-entrypoint.sh b/mongo_4.2-bionic/docker-entrypoint.sh
index e2c5a52..2313c41 100755
--- a/mongo_4.2-bionic/docker-entrypoint.sh
+++ b/mongo_4.2-bionic/docker-entrypoint.sh
@@ -337,7 +337,12 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+ mongoShell='mongo'
+ if ! command -v "$mongoShell" > /dev/null; then
+ mongoShell='mongosh'
+ fi
+
+ mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_4.2-windowsservercore-1809/Dockerfile b/mongo_4.2-windowsservercore-1809/Dockerfile
index 6609e4f..315a18a 100644
--- a/mongo_4.2-windowsservercore-1809/Dockerfile
+++ b/mongo_4.2-windowsservercore-1809/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,ImportExportTools,MiscellaneousTools,MonitoringTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile b/mongo_4.2-windowsservercore-ltsc2022/Dockerfile
index 947de14..b0a6e45 100644
--- a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4.2-windowsservercore-ltsc2022/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,ImportExportTools,MiscellaneousTools,MonitoringTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_focal/Dockerfile b/mongo_5-focal/Dockerfile
similarity index 100%
copy from mongo_focal/Dockerfile
copy to mongo_5-focal/Dockerfile
diff --git a/mongo_focal/docker-entrypoint.sh b/mongo_5-focal/docker-entrypoint.sh
similarity index 98%
copy from mongo_focal/docker-entrypoint.sh
copy to mongo_5-focal/docker-entrypoint.sh
index e2c5a52..2313c41 100755
--- a/mongo_focal/docker-entrypoint.sh
+++ b/mongo_5-focal/docker-entrypoint.sh
@@ -337,7 +337,12 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+ mongoShell='mongo'
+ if ! command -v "$mongoShell" > /dev/null; then
+ mongoShell='mongosh'
+ fi
+
+ mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_nanoserver-1809/Dockerfile b/mongo_5-nanoserver-1809/Dockerfile
similarity index 100%
copy from mongo_nanoserver-1809/Dockerfile
copy to mongo_5-nanoserver-1809/Dockerfile
diff --git a/mongo_nanoserver-ltsc2022/Dockerfile b/mongo_5-nanoserver-ltsc2022/Dockerfile
similarity index 100%
copy from mongo_nanoserver-ltsc2022/Dockerfile
copy to mongo_5-nanoserver-ltsc2022/Dockerfile
diff --git a/mongo_windowsservercore-1809/Dockerfile b/mongo_5-windowsservercore-1809/Dockerfile
similarity index 97%
copy from mongo_windowsservercore-1809/Dockerfile
copy to mongo_5-windowsservercore-1809/Dockerfile
index 40974fc..702d54d 100644
--- a/mongo_windowsservercore-1809/Dockerfile
+++ b/mongo_5-windowsservercore-1809/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_windowsservercore-ltsc2022/Dockerfile b/mongo_5-windowsservercore-ltsc2022/Dockerfile
similarity index 97%
copy from mongo_windowsservercore-ltsc2022/Dockerfile
copy to mongo_5-windowsservercore-ltsc2022/Dockerfile
index 5f8bd24..00b9cd4 100644
--- a/mongo_windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_5-windowsservercore-ltsc2022/Dockerfile
@@ -40,7 +40,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'INSTALLLOCATION=C:\mongodb', \
'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
diff --git a/mongo_focal/Dockerfile b/mongo_focal/Dockerfile
index 6cf857e..4610652 100644
--- a/mongo_focal/Dockerfile
+++ b/mongo_focal/Dockerfile
@@ -71,7 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
- set -- 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
+ set -- '39BD841E4BE5FB195A65400E6A26B1AE64C3C388'; \
for key; do \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
done; \
@@ -88,12 +88,12 @@ ARG MONGO_PACKAGE=mongodb-org
ARG MONGO_REPO=repo.mongodb.org
ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
-ENV MONGO_MAJOR 5.0
+ENV MONGO_MAJOR 6.0
RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
-# https://docs.mongodb.org/master/release-notes/5.0/
-ENV MONGO_VERSION 5.0.11
-# 08/15/2022, https://github.com/mongodb/mongo/tree/d08c3c41c105cde798ca934e3ac3426ac11b57c3
+# https://docs.mongodb.org/master/release-notes/6.0/
+ENV MONGO_VERSION 6.0.1
+# 08/15/2022, https://github.com/mongodb/mongo/tree/32f0f9c88dc44a2c8073a5bd47cf779d4bfdee6b
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_focal/docker-entrypoint.sh b/mongo_focal/docker-entrypoint.sh
index e2c5a52..2313c41 100755
--- a/mongo_focal/docker-entrypoint.sh
+++ b/mongo_focal/docker-entrypoint.sh
@@ -337,7 +337,12 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
+ mongoShell='mongo'
+ if ! command -v "$mongoShell" > /dev/null; then
+ mongoShell='mongosh'
+ fi
+
+ mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_nanoserver-1809/Dockerfile b/mongo_nanoserver-1809/Dockerfile
index 43b27ba..20fdcfe 100644
--- a/mongo_nanoserver-1809/Dockerfile
+++ b/mongo_nanoserver-1809/Dockerfile
@@ -14,18 +14,18 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-COPY --from=mongo:5.0.11-windowsservercore-1809 \
+COPY --from=mongo:6.0.1-windowsservercore-1809 \
C:\\Windows\\System32\\msvcp140.dll \
C:\\Windows\\System32\\vcruntime140.dll \
C:\\Windows\\System32\\vcruntime140_1.dll \
C:\\Windows\\System32\\
-# https://docs.mongodb.org/master/release-notes/5.0/
-ENV MONGO_VERSION 5.0.11
-# 08/15/2022, https://github.com/mongodb/mongo/tree/d08c3c41c105cde798ca934e3ac3426ac11b57c3
+# https://docs.mongodb.org/master/release-notes/6.0/
+ENV MONGO_VERSION 6.0.1
+# 08/15/2022, https://github.com/mongodb/mongo/tree/32f0f9c88dc44a2c8073a5bd47cf779d4bfdee6b
-COPY --from=mongo:5.0.11-windowsservercore-1809 C:\\mongodb C:\\mongodb
-RUN mongo --version && mongod --version
+COPY --from=mongo:6.0.1-windowsservercore-1809 C:\\mongodb C:\\mongodb
+RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_nanoserver-ltsc2022/Dockerfile b/mongo_nanoserver-ltsc2022/Dockerfile
index 01765b3..5df2878 100644
--- a/mongo_nanoserver-ltsc2022/Dockerfile
+++ b/mongo_nanoserver-ltsc2022/Dockerfile
@@ -14,18 +14,18 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-COPY --from=mongo:5.0.11-windowsservercore-ltsc2022 \
+COPY --from=mongo:6.0.1-windowsservercore-ltsc2022 \
C:\\Windows\\System32\\msvcp140.dll \
C:\\Windows\\System32\\vcruntime140.dll \
C:\\Windows\\System32\\vcruntime140_1.dll \
C:\\Windows\\System32\\
-# https://docs.mongodb.org/master/release-notes/5.0/
-ENV MONGO_VERSION 5.0.11
-# 08/15/2022, https://github.com/mongodb/mongo/tree/d08c3c41c105cde798ca934e3ac3426ac11b57c3
+# https://docs.mongodb.org/master/release-notes/6.0/
+ENV MONGO_VERSION 6.0.1
+# 08/15/2022, https://github.com/mongodb/mongo/tree/32f0f9c88dc44a2c8073a5bd47cf779d4bfdee6b
-COPY --from=mongo:5.0.11-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
-RUN mongo --version && mongod --version
+COPY --from=mongo:6.0.1-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_windowsservercore-1809/Dockerfile b/mongo_windowsservercore-1809/Dockerfile
index 40974fc..b620c10 100644
--- a/mongo_windowsservercore-1809/Dockerfile
+++ b/mongo_windowsservercore-1809/Dockerfile
@@ -8,12 +8,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
-# https://docs.mongodb.org/master/release-notes/5.0/
-ENV MONGO_VERSION 5.0.11
-# 08/15/2022, https://github.com/mongodb/mongo/tree/d08c3c41c105cde798ca934e3ac3426ac11b57c3
+# https://docs.mongodb.org/master/release-notes/6.0/
+ENV MONGO_VERSION 6.0.1
+# 08/15/2022, https://github.com/mongodb/mongo/tree/32f0f9c88dc44a2c8073a5bd47cf779d4bfdee6b
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.11-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=c13f071b45dce322f2d6e6a7f569d1dbebbb8d9baa62f5f1bee8efd4479b7861
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.1-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=999b39df67a77eda3198f8412dc159b0cd8aa6677b901a0cf287921884306ac3
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
@@ -38,9 +38,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'/l*v', 'install.log', \
# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows-unattended/#run-the-windows-installer-from-the-windows-command-interpreter
'INSTALLLOCATION=C:\mongodb', \
- 'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
+ 'ADDLOCAL=MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
@@ -51,7 +51,6 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
\
Write-Host 'Verifying install ...'; \
- Write-Host ' mongo --version'; mongo --version; \
Write-Host ' mongod --version'; mongod --version; \
\
Write-Host 'Removing ...'; \
diff --git a/mongo_windowsservercore-ltsc2022/Dockerfile b/mongo_windowsservercore-ltsc2022/Dockerfile
index 5f8bd24..ae7a97b 100644
--- a/mongo_windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_windowsservercore-ltsc2022/Dockerfile
@@ -8,12 +8,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
-# https://docs.mongodb.org/master/release-notes/5.0/
-ENV MONGO_VERSION 5.0.11
-# 08/15/2022, https://github.com/mongodb/mongo/tree/d08c3c41c105cde798ca934e3ac3426ac11b57c3
+# https://docs.mongodb.org/master/release-notes/6.0/
+ENV MONGO_VERSION 6.0.1
+# 08/15/2022, https://github.com/mongodb/mongo/tree/32f0f9c88dc44a2c8073a5bd47cf779d4bfdee6b
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.11-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=c13f071b45dce322f2d6e6a7f569d1dbebbb8d9baa62f5f1bee8efd4479b7861
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.1-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=999b39df67a77eda3198f8412dc159b0cd8aa6677b901a0cf287921884306ac3
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
@@ -38,9 +38,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
'/l*v', 'install.log', \
# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows-unattended/#run-the-windows-installer-from-the-windows-command-interpreter
'INSTALLLOCATION=C:\mongodb', \
- 'ADDLOCAL=Client,MiscellaneousTools,Router,ServerNoService' \
+ 'ADDLOCAL=MiscellaneousTools,Router,ServerNoService' \
); \
- if (-Not (Test-Path C:\mongodb\bin\mongo.exe -PathType Leaf)) { \
+ if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \
Write-Host 'Installer failed!'; \
Get-Content install.log; \
exit 1; \
@@ -51,7 +51,6 @@ RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \
\
Write-Host 'Verifying install ...'; \
- Write-Host ' mongo --version'; mongo --version; \
Write-Host ' mongod --version'; mongod --version; \
\
Write-Host 'Removing ...'; \Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: