CLOUDP-346295: add MDB 8.2

build/ci/release.yml

@@ -237,6 +237,7 @@ functions:
           - distro
           - edition
           - server_version
+          - pgp_server_version
           - project
           - revision
           - created_at
@@ -271,6 +272,7 @@ functions:
           - project
           - revision
           - server_version
+          - pgp_server_version
           - created_at
           - image
         working_dir: src/github.com/mongodb/mongodb-atlas-cli/build/package/docker/meta
@@ -297,6 +299,7 @@ functions:
           - entrypoint
           - mongo_package
           - mongo_repo
+          - pgp_server_version
         working_dir: src/github.com/mongodb/mongodb-atlas-cli/build/package/docker/repo
         binary: ./docker-build.sh
   "create-windows-host":

build/package/docker/meta/amazonlinux2023-rpm.Dockerfile

@@ -3,8 +3,9 @@ FROM artifactory.corp.mongodb.com/dockerhub/amazonlinux:2023
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
-RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/amazon/2023/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
+RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/amazon/2023/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
 
 RUN set -eux; \
     curl --silent --show-error --fail --location --retry 3 \

build/package/docker/meta/centos8-rpm.Dockerfile

@@ -3,10 +3,11 @@ FROM artifactory.corp.mongodb.com/dockerhub/centos:8
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN rm -rf /etc/yum.repos.d/*
 
-RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
+RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
 
 RUN set -eux; \
     curl --silent --show-error --fail --location --retry 3 \

build/package/docker/meta/debian11-deb.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:11-slim
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN set -eux; \
 	apt-get update; \
@@ -15,7 +16,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/debian bullseye/mongodb-org/${server_version} main" | tee /etc/apt/sources.list.d/mongodb-org-${server_version}.list; \
 	rm -rf /var/lib/apt/lists/*
 

build/package/docker/meta/debian12-deb.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:12-slim
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN set -eux; \
 	apt-get update; \
@@ -15,7 +16,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/debian bookworm/mongodb-org/${server_version} main" | tee /etc/apt/sources.list.d/mongodb-org-${server_version}.list; \
 	rm -rf /var/lib/apt/lists/*
 

build/package/docker/meta/docker-build.sh

@@ -30,5 +30,6 @@ docker build \
 	--build-arg url="${URL-}" \
 	--build-arg entrypoint="${ENTRYPOINT-}" \
 	--build-arg server_version="${server_version-}" \
+	--build-arg pgp_server_version="${pgp_server_version-}" \
 	-t "atlascli-${image-}" \
 	-f "${image-}.Dockerfile" .

build/package/docker/meta/rhel9-rpm.Dockerfile

@@ -3,10 +3,11 @@ FROM registry.access.redhat.com/ubi9/ubi
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN rm -rf /etc/yum.repos.d/*
 
-RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
+RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
 
 RUN set -eux; \
     curl --silent --show-error --fail --location --retry 3 \

build/package/docker/meta/suse15-rpm.Dockerfile

@@ -3,6 +3,7 @@ FROM registry.suse.com/suse/sle15
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN rpm --import https://pgp.mongodb.com/server-${server_version}.asc
 

build/package/docker/meta/ubuntu20.04-deb.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:20.04
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN set -eux; \
 	apt-get update; \
@@ -14,7 +15,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/${server_version} multiverse" | tee /etc/apt/sources.list.d/mongodb-org-${server_version}.list; \
 	rm -rf /var/lib/apt/lists/*
 

build/package/docker/meta/ubuntu22.04-deb.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:22.04
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN set -eux; \
 	apt-get update; \
@@ -14,7 +15,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/${server_version} multiverse" | tee /etc/apt/sources.list.d/mongodb-org-${server_version}.list; \
 	rm -rf /var/lib/apt/lists/*
 

build/package/docker/meta/ubuntu24.04-deb.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:24.04
 ARG url
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 
 RUN set -eux; \
 	apt-get update; \
@@ -14,7 +15,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/${server_version} multiverse" | tee /etc/apt/sources.list.d/mongodb-org-${server_version}.list; \
 	rm -rf /var/lib/apt/lists/*
 

build/package/docker/repo/amazonlinux2023.Dockerfile

@@ -3,10 +3,11 @@ FROM artifactory.corp.mongodb.com/dockerhub/amazonlinux:2023
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
-RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/amazon/2023/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
+RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/amazon/2023/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
 
 RUN set -eux; \
     yum install -y ${package}

build/package/docker/repo/centos8.Dockerfile

@@ -3,12 +3,13 @@ FROM artifactory.corp.mongodb.com/dockerhub/centos:8
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
 RUN rm -rf /etc/yum.repos.d/*
 
-RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/redhat/\$releasever/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
+RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/redhat/\$releasever/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
 
 RUN set -eux; \
     yum install -y ${package}

build/package/docker/repo/debian11.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:11-slim
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
@@ -16,7 +17,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] ${mongo_repo}/apt/debian bullseye/${mongo_package}/${server_version} main" | tee /etc/apt/sources.list.d/${mongo_package}-${server_version}.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends ${package}; \

build/package/docker/repo/debian12.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:12-slim
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
@@ -16,7 +17,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] ${mongo_repo}/apt/debian bookworm/${mongo_package}/${server_version} main" | tee /etc/apt/sources.list.d/${mongo_package}-${server_version}.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends ${package}; \

build/package/docker/repo/docker-build.sh

@@ -18,6 +18,7 @@ set -Eeou pipefail
 
 docker build \
 	--build-arg server_version="${server_version-}" \
+	--build-arg pgp_server_version="${pgp_server_version-}" \
 	--build-arg package="${package-}" \
 	--build-arg entrypoint="${entrypoint-}" \
 	--build-arg mongo_package="${mongo_package-}" \

build/package/docker/repo/rhel9.Dockerfile

@@ -3,12 +3,13 @@ FROM registry.access.redhat.com/ubi9/ubi
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
 RUN rm -rf /etc/yum.repos.d/*
 
-RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/redhat/\$releasever/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
+RUN printf "[${mongo_package}-${server_version}]\nname=MongoDB Repository\nbaseurl=${mongo_repo}/yum/redhat/\$releasever/${mongo_package}/${server_version}/\$basearch/\ngpgcheck=1\nenabled=1\ngpgkey=https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc\n" > /etc/yum.repos.d/${mongo_package}-${server_version}.repo
 
 RUN set -eux; \
     yum install -y ${package}

build/package/docker/repo/suse15.Dockerfile

@@ -3,6 +3,7 @@ FROM registry.suse.com/suse/sle15
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 

build/package/docker/repo/ubuntu20.04.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:20.04
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
@@ -16,7 +17,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] ${mongo_repo}/apt/ubuntu focal/${mongo_package}/${server_version} multiverse" | tee /etc/apt/sources.list.d/${mongo_package}-${server_version}.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends ${package}; \

build/package/docker/repo/ubuntu22.04.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:22.04
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
@@ -16,7 +17,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] ${mongo_repo}/apt/ubuntu jammy/${mongo_package}/${server_version} multiverse" | tee /etc/apt/sources.list.d/${mongo_package}-${server_version}.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends ${package}; \

build/package/docker/repo/ubuntu24.04.Dockerfile

@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:24.04
 ARG package
 ARG entrypoint
 ARG server_version
+ARG pgp_server_version
 ARG mongo_package
 ARG mongo_repo
 
@@ -16,7 +17,7 @@ RUN set -eux; \
 	if ! command -v ps > /dev/null; then \
 		apt-get install -y --no-install-recommends procps; \
 	fi; \
-	curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
+	curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
 	echo "deb [ arch=amd64,arm64 ] ${mongo_repo}/apt/ubuntu noble/${mongo_package}/${server_version} multiverse" | tee /etc/apt/sources.list.d/${mongo_package}-${server_version}.list; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends ${package}; \

internal/cli/deployments/options/deployment_opts.go

@@ -21,10 +21,12 @@ import (
 	"io"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/Masterminds/semver/v3"
 	"github.com/briandowns/spinner"
 	"github.com/mongodb/atlas-cli-core/config"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
@@ -156,7 +158,8 @@ func getLocalDevImage() string {
 }
 
 func (opts *DeploymentOpts) MongodDockerImageName() string {
-	return getLocalDevImage() + ":" + opts.MdbVersion
+	v, _ := semver.NewVersion(opts.MdbVersion)
+	return getLocalDevImage() + ":" + strconv.FormatUint(v.Major(), 10)
 }
 
 func (opts *DeploymentOpts) Spin(funcs ...func() error) error {

internal/cli/deployments/setup.go

@@ -52,8 +52,10 @@ import (
 
 const (
 	internalMongodPort         = 27017
-	mdb7                       = "7.0"
-	mdb8                       = "8.0"
+	mdb70                      = "7.0"
+	mdb80                      = "8.0"
+	mdb8                       = "8"
+	mdb7                       = "7"
 	defaultSettings            = "default"
 	customSettings             = "custom"
 	cancelSettings             = "cancel"
@@ -106,7 +108,8 @@ var (
 		options.VsCodeConnect:  "MongoDB for VsCode",
 		skipConnect:            "Skip Connection",
 	}
-	mdbVersions = []string{mdb7, mdb8}
+	mdbVersions      = []string{mdb70, mdb80, mdb8, mdb7}
+	mdbMajorVersions = []string{mdb7, mdb8}
 )
 
 type SetupOpts struct {
@@ -347,8 +350,8 @@ func (opts *SetupOpts) promptDeploymentName() error {
 
 func (opts *SetupOpts) promptMdbVersion() error {
 	p := &survey.Select{
-		Message: "Major MongoDB Version",
-		Options: mdbVersions,
+		Message: "Major MongoDB Version (latest minor version will be used)",
+		Options: mdbMajorVersions,
 		Default: opts.MdbVersion,
 		Help:    "Major MongoDB Version for the deployment. Atlas CLI applies the latest minor version available.",
 	}
@@ -517,7 +520,7 @@ func (opts *SetupOpts) setDefaultSettings() error {
 		if err := templatewriter.Print(os.Stderr, `
 [Default Settings]
 Deployment Name	{{.DeploymentName}}
-MongoDB Version	{{.MdbVersion}}
+MongoDB Major Version	{{.MdbVersion}} (latest minor version)
 
 `, opts); err != nil {
 			return err