Skip to content

Commit 3bb80d5

Browse files
authored
CLOUDP-346295: add MDB 8.2 (#4232)
1 parent 99cc84b commit 3bb80d5

30 files changed

+145
-49
lines changed

build/ci/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ functions:
237237
- distro
238238
- edition
239239
- server_version
240+
- pgp_server_version
240241
- project
241242
- revision
242243
- created_at
@@ -271,6 +272,7 @@ functions:
271272
- project
272273
- revision
273274
- server_version
275+
- pgp_server_version
274276
- created_at
275277
- image
276278
working_dir: src/github.com/mongodb/mongodb-atlas-cli/build/package/docker/meta
@@ -297,6 +299,7 @@ functions:
297299
- entrypoint
298300
- mongo_package
299301
- mongo_repo
302+
- pgp_server_version
300303
working_dir: src/github.com/mongodb/mongodb-atlas-cli/build/package/docker/repo
301304
binary: ./docker-build.sh
302305
"create-windows-host":

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ FROM artifactory.corp.mongodb.com/dockerhub/amazonlinux:2023
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

7-
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
8+
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
89

910
RUN set -eux; \
1011
curl --silent --show-error --fail --location --retry 3 \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ FROM artifactory.corp.mongodb.com/dockerhub/centos:8
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN rm -rf /etc/yum.repos.d/*
89

9-
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
10+
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
1011

1112
RUN set -eux; \
1213
curl --silent --show-error --fail --location --retry 3 \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:11-slim
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN set -eux; \
89
apt-get update; \
@@ -15,7 +16,7 @@ RUN set -eux; \
1516
if ! command -v ps > /dev/null; then \
1617
apt-get install -y --no-install-recommends procps; \
1718
fi; \
18-
curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
19+
curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
1920
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; \
2021
rm -rf /var/lib/apt/lists/*
2122

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/debian:12-slim
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN set -eux; \
89
apt-get update; \
@@ -15,7 +16,7 @@ RUN set -eux; \
1516
if ! command -v ps > /dev/null; then \
1617
apt-get install -y --no-install-recommends procps; \
1718
fi; \
18-
curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
19+
curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
1920
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; \
2021
rm -rf /var/lib/apt/lists/*
2122

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ docker build \
3030
--build-arg url="${URL-}" \
3131
--build-arg entrypoint="${ENTRYPOINT-}" \
3232
--build-arg server_version="${server_version-}" \
33+
--build-arg pgp_server_version="${pgp_server_version-}" \
3334
-t "atlascli-${image-}" \
3435
-f "${image-}.Dockerfile" .

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ FROM registry.access.redhat.com/ubi9/ubi
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN rm -rf /etc/yum.repos.d/*
89

9-
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
10+
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
1011

1112
RUN set -eux; \
1213
curl --silent --show-error --fail --location --retry 3 \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM registry.suse.com/suse/sle15
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN rpm --import https://pgp.mongodb.com/server-${server_version}.asc
89

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:20.04
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN set -eux; \
89
apt-get update; \
@@ -14,7 +15,7 @@ RUN set -eux; \
1415
if ! command -v ps > /dev/null; then \
1516
apt-get install -y --no-install-recommends procps; \
1617
fi; \
17-
curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
18+
curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
1819
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; \
1920
rm -rf /var/lib/apt/lists/*
2021

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM artifactory.corp.mongodb.com/dockerhub/ubuntu:22.04
33
ARG url
44
ARG entrypoint
55
ARG server_version
6+
ARG pgp_server_version
67

78
RUN set -eux; \
89
apt-get update; \
@@ -14,7 +15,7 @@ RUN set -eux; \
1415
if ! command -v ps > /dev/null; then \
1516
apt-get install -y --no-install-recommends procps; \
1617
fi; \
17-
curl -L https://www.mongodb.org/static/pgp/server-${server_version}.asc | apt-key add -; \
18+
curl -L https://www.mongodb.org/static/pgp/server-${pgp_server_version}.asc | apt-key add -; \
1819
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; \
1920
rm -rf /var/lib/apt/lists/*
2021

0 commit comments

Comments
 (0)