From 6f6ea49ba5ed96db3cb865741563555019289cf7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Apr 2024 03:06:19 -0700 Subject: [PATCH] Update 6.0-rc --- 6.0-rc/Dockerfile | 121 ----- 6.0-rc/docker-entrypoint.sh | 420 ------------------ 6.0-rc/windows/nanoserver-1809/Dockerfile | 33 -- 6.0-rc/windows/nanoserver-ltsc2022/Dockerfile | 33 -- .../windows/windowsservercore-1809/Dockerfile | 67 --- .../windowsservercore-ltsc2022/Dockerfile | 67 --- versions.json | 73 +-- 7 files changed, 1 insertion(+), 813 deletions(-) delete mode 100644 6.0-rc/Dockerfile delete mode 100755 6.0-rc/docker-entrypoint.sh delete mode 100644 6.0-rc/windows/nanoserver-1809/Dockerfile delete mode 100644 6.0-rc/windows/nanoserver-ltsc2022/Dockerfile delete mode 100644 6.0-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 6.0-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/6.0-rc/Dockerfile b/6.0-rc/Dockerfile deleted file mode 100644 index fe966d3c20..0000000000 --- a/6.0-rc/Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM ubuntu:jammy - -# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN set -eux; \ - groupadd --gid 999 --system mongodb; \ - useradd --uid 999 --system --gid mongodb --home-dir /data/db mongodb; \ - mkdir -p /data/db /data/configdb; \ - chown -R mongodb:mongodb /data/db /data/configdb - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - jq \ - numactl \ - procps \ - ; \ - rm -rf /var/lib/apt/lists/* - -# grab gosu for easy step-down from root (https://github.com/tianon/gosu/releases) -ENV GOSU_VERSION 1.17 -# grab "js-yaml" for parsing mongod's YAML config files (https://github.com/nodeca/js-yaml/releases) -ENV JSYAML_VERSION 3.13.1 - -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - gnupg \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ -# download/install gosu - dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - \ -# download/install js-yaml - mkdir -p /opt/js-yaml/; \ - wget -O /opt/js-yaml/js-yaml.js "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/dist/js-yaml.js"; \ - wget -O /opt/js-yaml/package.json "https://github.com/nodeca/js-yaml/raw/${JSYAML_VERSION}/package.json"; \ - ln -s /opt/js-yaml/js-yaml.js /js-yaml.js; \ -# TODO some sort of download verification here - \ -# download/install MongoDB PGP keys - export GNUPGHOME="$(mktemp -d)"; \ - wget -O KEYS 'https://pgp.mongodb.com/server-dev.asc' 'https://pgp.mongodb.com/server-6.0.asc'; \ - gpg --batch --import KEYS; \ - mkdir -p /etc/apt/keyrings; \ - gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' '39BD841E4BE5FB195A65400E6A26B1AE64C3C388' > /etc/apt/keyrings/mongodb.asc; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" KEYS; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ -# smoke test - chmod +x /usr/local/bin/gosu; \ - gosu --version; \ - gosu nobody true - -RUN mkdir /docker-entrypoint-initdb.d - -# Allow build-time overrides (eg. to build image with MongoDB Enterprise version) -# Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise -# Options for MONGO_REPO: repo.mongodb.org OR repo.mongodb.com -# Example: docker build --build-arg MONGO_PACKAGE=mongodb-enterprise --build-arg MONGO_REPO=repo.mongodb.com . -ARG MONGO_PACKAGE=mongodb-org -ARG MONGO_REPO=repo.mongodb.org -ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO} - -ENV MONGO_MAJOR testing -RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list" -# add GA repo for mongodb-mongosh and mongodb-database-tools -RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/6.0 multiverse" | tee "/etc/apt/sources.list.d/mongodb-6.0.list" - -# https://docs.mongodb.org/master/release-notes/6.0/ -ENV MONGO_VERSION 6.0.15~rc0 -# 04/09/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e - -RUN set -x \ -# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input - && export DEBIAN_FRONTEND=noninteractive \ - && apt-get update \ - && apt-get install -y \ - ${MONGO_PACKAGE}=$MONGO_VERSION \ - ${MONGO_PACKAGE}-server=$MONGO_VERSION \ - ${MONGO_PACKAGE}-shell=$MONGO_VERSION \ - ${MONGO_PACKAGE}-mongos=$MONGO_VERSION \ - ${MONGO_PACKAGE}-tools=$MONGO_VERSION \ - ${MONGO_PACKAGE}-database=$MONGO_VERSION \ - ${MONGO_PACKAGE}-database-tools-extra=$MONGO_VERSION \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /var/lib/mongodb \ - && mv /etc/mongod.conf /etc/mongod.conf.orig - -VOLUME /data/db /data/configdb - -# ensure that if running as custom user that "mongosh" has a valid "HOME" -# https://github.com/docker-library/mongo/issues/524 -ENV HOME /data/db - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -EXPOSE 27017 -CMD ["mongod"] diff --git a/6.0-rc/docker-entrypoint.sh b/6.0-rc/docker-entrypoint.sh deleted file mode 100755 index df4073d8cc..0000000000 --- a/6.0-rc/docker-entrypoint.sh +++ /dev/null @@ -1,420 +0,0 @@ -#!/bin/bash -set -Eeuo pipefail - -if [ "${1:0:1}" = '-' ]; then - set -- mongod "$@" -fi - -originalArgOne="$1" - -# allow the container to be started with `--user` -# all mongo* commands should be dropped to the correct user -if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then - if [ "$originalArgOne" = 'mongod' ]; then - find /data/configdb /data/db \! -user mongodb -exec chown mongodb '{}' + - fi - - # make sure we can write to stdout and stderr as "mongodb" - # (for our "initdb" code later; see "--logpath" below) - chown --dereference mongodb "/proc/$$/fd/1" "/proc/$$/fd/2" || : - # ignore errors thanks to https://github.com/docker-library/mongo/issues/149 - - exec gosu mongodb "$BASH_SOURCE" "$@" -fi - -dpkgArch="$(dpkg --print-architecture)" -case "$dpkgArch" in - amd64) # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814 - if ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then - { - echo - echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!' - echo ' see https://jira.mongodb.org/browse/SERVER-54407' - echo ' see also https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2' - echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814' - echo - } >&2 - fi - ;; - - arm64) # https://github.com/docker-library/mongo/issues/485#issuecomment-970864306 - # https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features - # http://javathunderx.blogspot.com/2018/11/cheat-sheet-for-cpuinfo-features-on.html - if ! grep -qE '^Features.* (fphp|dcpop|sha3|sm3|sm4|asimddp|sha512|sve)( .*|$)' /proc/cpuinfo; then - { - echo - echo 'WARNING: MongoDB requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!' - echo ' applies to all versions ≥5.0, any of 4.4 ≥4.4.19' - echo ' see https://jira.mongodb.org/browse/SERVER-71772' - echo ' see https://jira.mongodb.org/browse/SERVER-55178' - echo ' see also https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features' - echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-970864306' - echo - } >&2 - fi - ;; -esac - -# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients. -# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux -if [[ "$originalArgOne" == mongo* ]]; then - numa='numactl --interleave=all' - if $numa true &> /dev/null; then - set -- $numa "$@" - fi -fi - -# usage: file_env VAR [DEFAULT] -# ie: file_env 'XYZ_DB_PASSWORD' 'example' -# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of -# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi - local val="$def" - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - export "$var"="$val" - unset "$fileVar" -} - -# see https://github.com/docker-library/mongo/issues/147 (mongod is picky about duplicated arguments) -_mongod_hack_have_arg() { - local checkArg="$1"; shift - local arg - for arg; do - case "$arg" in - "$checkArg"|"$checkArg"=*) - return 0 - ;; - esac - done - return 1 -} -# _mongod_hack_get_arg_val '--some-arg' "$@" -_mongod_hack_get_arg_val() { - local checkArg="$1"; shift - while [ "$#" -gt 0 ]; do - local arg="$1"; shift - case "$arg" in - "$checkArg") - echo "$1" - return 0 - ;; - "$checkArg"=*) - echo "${arg#$checkArg=}" - return 0 - ;; - esac - done - return 1 -} -declare -a mongodHackedArgs -# _mongod_hack_ensure_arg '--some-arg' "$@" -# set -- "${mongodHackedArgs[@]}" -_mongod_hack_ensure_arg() { - local ensureArg="$1"; shift - mongodHackedArgs=( "$@" ) - if ! _mongod_hack_have_arg "$ensureArg" "$@"; then - mongodHackedArgs+=( "$ensureArg" ) - fi -} -# _mongod_hack_ensure_no_arg '--some-unwanted-arg' "$@" -# set -- "${mongodHackedArgs[@]}" -_mongod_hack_ensure_no_arg() { - local ensureNoArg="$1"; shift - mongodHackedArgs=() - while [ "$#" -gt 0 ]; do - local arg="$1"; shift - if [ "$arg" = "$ensureNoArg" ]; then - continue - fi - mongodHackedArgs+=( "$arg" ) - done -} -# _mongod_hack_ensure_no_arg '--some-unwanted-arg' "$@" -# set -- "${mongodHackedArgs[@]}" -_mongod_hack_ensure_no_arg_val() { - local ensureNoArg="$1"; shift - mongodHackedArgs=() - while [ "$#" -gt 0 ]; do - local arg="$1"; shift - case "$arg" in - "$ensureNoArg") - shift # also skip the value - continue - ;; - "$ensureNoArg"=*) - # value is already included - continue - ;; - esac - mongodHackedArgs+=( "$arg" ) - done -} -# _mongod_hack_ensure_arg_val '--some-arg' 'some-val' "$@" -# set -- "${mongodHackedArgs[@]}" -_mongod_hack_ensure_arg_val() { - local ensureArg="$1"; shift - local ensureVal="$1"; shift - _mongod_hack_ensure_no_arg_val "$ensureArg" "$@" - mongodHackedArgs+=( "$ensureArg" "$ensureVal" ) -} - -# _js_escape 'some "string" value' -_js_escape() { - jq --null-input --arg 'str' "$1" '$str' -} - -: "${TMPDIR:=/tmp}" -jsonConfigFile="$TMPDIR/docker-entrypoint-config.json" -tempConfigFile="$TMPDIR/docker-entrypoint-temp-config.json" -_parse_config() { - if [ -s "$tempConfigFile" ]; then - return 0 - fi - - local configPath - if configPath="$(_mongod_hack_get_arg_val --config "$@")" && [ -s "$configPath" ]; then - # if --config is specified, parse it into a JSON file so we can remove a few problematic keys (especially SSL-related keys) - # see https://docs.mongodb.com/manual/reference/configuration-options/ - if grep -vEm1 '^[[:space:]]*(#|$)' "$configPath" | grep -qE '^[[:space:]]*[^=:]+[[:space:]]*='; then - # if the first non-comment/non-blank line of the config file looks like "foo = ...", this is probably the 2.4 and older "ini-style config format" - # mongod tries to parse config as yaml and then falls back to ini-style parsing - # https://github.com/mongodb/mongo/blob/r6.0.3/src/mongo/util/options_parser/options_parser.cpp#L1883-L1894 - echo >&2 - echo >&2 "WARNING: it appears that '$configPath' is in the older INI-style format (replaced by YAML in MongoDB 2.6)" - echo >&2 ' This script does not parse the older INI-style format, and thus will ignore it.' - echo >&2 - return 1 - fi - if [ "$mongoShell" = 'mongo' ]; then - "$mongoShell" --norc --nodb --quiet --eval "load('/js-yaml.js'); printjson(jsyaml.load(cat($(_js_escape "$configPath"))))" > "$jsonConfigFile" - else - # https://www.mongodb.com/docs/manual/reference/method/js-native/#std-label-native-in-mongosh - "$mongoShell" --norc --nodb --quiet --eval "load('/js-yaml.js'); JSON.stringify(jsyaml.load(fs.readFileSync($(_js_escape "$configPath"), 'utf8')))" > "$jsonConfigFile" - fi - if [ "$(head -c1 "$jsonConfigFile")" != '{' ] || [ "$(tail -c2 "$jsonConfigFile")" != '}' ]; then - # if the file doesn't start with "{" and end with "}", it's *probably* an error ("uncaught exception: YAMLException: foo" for example), so we should print it out - echo >&2 'error: unexpected "js-yaml.js" output while parsing config:' - cat >&2 "$jsonConfigFile" - exit 1 - fi - jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile" - return 0 - fi - - return 1 -} -dbPath= -_dbPath() { - if [ -n "$dbPath" ]; then - echo "$dbPath" - return - fi - - if ! dbPath="$(_mongod_hack_get_arg_val --dbpath "$@")"; then - if _parse_config "$@"; then - dbPath="$(jq -r '.storage.dbPath // empty' "$jsonConfigFile")" - fi - fi - - if [ -z "$dbPath" ]; then - if _mongod_hack_have_arg --configsvr "$@" || { - _parse_config "$@" \ - && clusterRole="$(jq -r '.sharding.clusterRole // empty' "$jsonConfigFile")" \ - && [ "$clusterRole" = 'configsvr' ] - }; then - # if running as config server, then the default dbpath is /data/configdb - # https://docs.mongodb.com/manual/reference/program/mongod/#cmdoption-mongod-configsvr - dbPath=/data/configdb - fi - fi - - : "${dbPath:=/data/db}" - - echo "$dbPath" -} - -if [ "$originalArgOne" = 'mongod' ]; then - file_env 'MONGO_INITDB_ROOT_USERNAME' - file_env 'MONGO_INITDB_ROOT_PASSWORD' - - mongoShell='mongo' - if ! command -v "$mongoShell" > /dev/null; then - mongoShell='mongosh' - fi - - # pre-check a few factors to see if it's even worth bothering with initdb - shouldPerformInitdb= - if [ "$MONGO_INITDB_ROOT_USERNAME" ] && [ "$MONGO_INITDB_ROOT_PASSWORD" ]; then - # if we have a username/password, let's set "--auth" - _mongod_hack_ensure_arg '--auth' "$@" - set -- "${mongodHackedArgs[@]}" - shouldPerformInitdb='true' - elif [ "$MONGO_INITDB_ROOT_USERNAME" ] || [ "$MONGO_INITDB_ROOT_PASSWORD" ]; then - cat >&2 <<-'EOF' - - error: missing 'MONGO_INITDB_ROOT_USERNAME' or 'MONGO_INITDB_ROOT_PASSWORD' - both must be specified for a user to be created - - EOF - exit 1 - fi - - if [ -z "$shouldPerformInitdb" ]; then - # if we've got any /docker-entrypoint-initdb.d/* files to parse later, we should initdb - for f in /docker-entrypoint-initdb.d/*; do - case "$f" in - *.sh|*.js) # this should match the set of files we check for below - shouldPerformInitdb="$f" - break - ;; - esac - done - fi - - # check for a few known paths (to determine whether we've already initialized and should thus skip our initdb scripts) - if [ -n "$shouldPerformInitdb" ]; then - dbPath="$(_dbPath "$@")" - for path in \ - "$dbPath/WiredTiger" \ - "$dbPath/journal" \ - "$dbPath/local.0" \ - "$dbPath/storage.bson" \ - ; do - if [ -e "$path" ]; then - shouldPerformInitdb= - break - fi - done - fi - - if [ -n "$shouldPerformInitdb" ]; then - mongodHackedArgs=( "$@" ) - if _parse_config "$@"; then - _mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}" - fi - _mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}" - _mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}" - _mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}" - - # remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control) - # https://github.com/docker-library/mongo/issues/211 - _mongod_hack_ensure_no_arg --auth "${mongodHackedArgs[@]}" - # "keyFile implies security.authorization" - # https://docs.mongodb.com/manual/reference/configuration-options/#mongodb-setting-security.keyFile - _mongod_hack_ensure_no_arg_val --keyFile "${mongodHackedArgs[@]}" - if [ "$MONGO_INITDB_ROOT_USERNAME" ] && [ "$MONGO_INITDB_ROOT_PASSWORD" ]; then - _mongod_hack_ensure_no_arg_val --replSet "${mongodHackedArgs[@]}" - fi - - # "BadValue: need sslPEMKeyFile when SSL is enabled" vs "BadValue: need to enable SSL via the sslMode flag when using SSL configuration parameters" - tlsMode='disabled' - if _mongod_hack_have_arg '--tlsCertificateKeyFile' "$@"; then - tlsMode='allowTLS' - fi - _mongod_hack_ensure_arg_val --tlsMode "$tlsMode" "${mongodHackedArgs[@]}" - - if stat "/proc/$$/fd/1" > /dev/null && [ -w "/proc/$$/fd/1" ]; then - # https://github.com/mongodb/mongo/blob/38c0eb538d0fd390c6cb9ce9ae9894153f6e8ef5/src/mongo/db/initialize_server_global_state.cpp#L237-L251 - # https://github.com/docker-library/mongo/issues/164#issuecomment-293965668 - _mongod_hack_ensure_arg_val --logpath "/proc/$$/fd/1" "${mongodHackedArgs[@]}" - else - initdbLogPath="$(_dbPath "$@")/docker-initdb.log" - echo >&2 "warning: initdb logs cannot write to '/proc/$$/fd/1', so they are in '$initdbLogPath' instead" - _mongod_hack_ensure_arg_val --logpath "$initdbLogPath" "${mongodHackedArgs[@]}" - fi - _mongod_hack_ensure_arg --logappend "${mongodHackedArgs[@]}" - - pidfile="$TMPDIR/docker-entrypoint-temp-mongod.pid" - rm -f "$pidfile" - _mongod_hack_ensure_arg_val --pidfilepath "$pidfile" "${mongodHackedArgs[@]}" - - "${mongodHackedArgs[@]}" --fork - - mongo=( "$mongoShell" --host 127.0.0.1 --port 27017 --quiet ) - - # check to see that our "mongod" actually did start up (catches "--help", "--version", slow prealloc, etc) - # https://jira.mongodb.org/browse/SERVER-16292 - tries=30 - while true; do - if ! { [ -s "$pidfile" ] && ps "$(< "$pidfile")" &> /dev/null; }; then - # bail ASAP if "mongod" isn't even running - echo >&2 - echo >&2 "error: $originalArgOne does not appear to have stayed running -- perhaps it had an error?" - echo >&2 - exit 1 - fi - if "${mongo[@]}" 'admin' --eval 'quit(0)' &> /dev/null; then - # success! - break - fi - (( tries-- )) - if [ "$tries" -le 0 ]; then - echo >&2 - echo >&2 "error: $originalArgOne does not appear to have accepted connections quickly enough -- perhaps it had an error?" - echo >&2 - exit 1 - fi - sleep 1 - done - - if [ "$MONGO_INITDB_ROOT_USERNAME" ] && [ "$MONGO_INITDB_ROOT_PASSWORD" ]; then - rootAuthDatabase='admin' - - "${mongo[@]}" "$rootAuthDatabase" <<-EOJS - db.createUser({ - user: $(_js_escape "$MONGO_INITDB_ROOT_USERNAME"), - pwd: $(_js_escape "$MONGO_INITDB_ROOT_PASSWORD"), - roles: [ { role: 'root', db: $(_js_escape "$rootAuthDatabase") } ] - }) - EOJS - fi - - export MONGO_INITDB_DATABASE="${MONGO_INITDB_DATABASE:-test}" - - echo - for f in /docker-entrypoint-initdb.d/*; do - case "$f" in - *.sh) echo "$0: running $f"; . "$f" ;; - *.js) echo "$0: running $f"; "${mongo[@]}" "$MONGO_INITDB_DATABASE" "$f"; echo ;; - *) echo "$0: ignoring $f" ;; - esac - echo - done - - "${mongodHackedArgs[@]}" --shutdown - rm -f "$pidfile" - - echo - echo 'MongoDB init process complete; ready for start up.' - echo - fi - - # MongoDB defaults to localhost-only binding - haveBindIp= - if _mongod_hack_have_arg --bind_ip "$@" || _mongod_hack_have_arg --bind_ip_all "$@"; then - haveBindIp=1 - elif _parse_config "$@" && jq --exit-status '.net.bindIp // .net.bindIpAll' "$jsonConfigFile" > /dev/null; then - haveBindIp=1 - fi - if [ -z "$haveBindIp" ]; then - # so if no "--bind_ip" is specified, let's add "--bind_ip_all" - set -- "$@" --bind_ip_all - fi - - unset "${!MONGO_INITDB_@}" -fi - -rm -f "$jsonConfigFile" "$tempConfigFile" - -exec "$@" diff --git a/6.0-rc/windows/nanoserver-1809/Dockerfile b/6.0-rc/windows/nanoserver-1809/Dockerfile deleted file mode 100644 index bb3f30ecdf..0000000000 --- a/6.0-rc/windows/nanoserver-1809/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/nanoserver:1809 - -SHELL ["cmd", "/S", "/C"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -USER ContainerAdministrator -RUN setx /m PATH "C:\mongodb\bin;%PATH%" -USER ContainerUser -# doing this first to share cache across versions more aggressively - -COPY --from=mongo:6.0.15-rc0-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/6.0/ -ENV MONGO_VERSION 6.0.15-rc0 -# 04/09/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e - -COPY --from=mongo:6.0.15-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb -RUN mongod --version - -VOLUME C:\\data\\db C:\\data\\configdb - -EXPOSE 27017 -CMD ["mongod", "--bind_ip_all"] diff --git a/6.0-rc/windows/nanoserver-ltsc2022/Dockerfile b/6.0-rc/windows/nanoserver-ltsc2022/Dockerfile deleted file mode 100644 index f47006d9cc..0000000000 --- a/6.0-rc/windows/nanoserver-ltsc2022/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 - -SHELL ["cmd", "/S", "/C"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -USER ContainerAdministrator -RUN setx /m PATH "C:\mongodb\bin;%PATH%" -USER ContainerUser -# doing this first to share cache across versions more aggressively - -COPY --from=mongo:6.0.15-rc0-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/6.0/ -ENV MONGO_VERSION 6.0.15-rc0 -# 04/09/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e - -COPY --from=mongo:6.0.15-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb -RUN mongod --version - -VOLUME C:\\data\\db C:\\data\\configdb - -EXPOSE 27017 -CMD ["mongod", "--bind_ip_all"] diff --git a/6.0-rc/windows/windowsservercore-1809/Dockerfile b/6.0-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index ca54437fcd..0000000000 --- a/6.0-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] - -# https://docs.mongodb.org/master/release-notes/6.0/ -ENV MONGO_VERSION 6.0.15-rc0 -# 04/09/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e - -ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.15-rc0-signed.msi -ENV MONGO_DOWNLOAD_SHA256=56729cf4652023a9700e3ac94547ff0a31a10a4e01a7e6e66fe943a179ea643d - -RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - (New-Object System.Net.WebClient).DownloadFile($env:MONGO_DOWNLOAD_URL, 'mongo.msi'); \ - \ - if ($env:MONGO_DOWNLOAD_SHA256) { \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:MONGO_DOWNLOAD_SHA256); \ - if ((Get-FileHash mongo.msi -Algorithm sha256).Hash -ne $env:MONGO_DOWNLOAD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - }; \ - \ - Write-Host 'Installing ...'; \ -# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/#install-mongodb-community-edition - Start-Process msiexec -Wait \ - -ArgumentList @( \ - '/i', \ - 'mongo.msi', \ - '/quiet', \ - '/qn', \ - '/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=MiscellaneousTools,Router,ServerNoService' \ - ); \ - if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \ - Write-Host 'Installer failed!'; \ - Get-Content install.log; \ - exit 1; \ - }; \ - Remove-Item install.log; \ - \ - $env:PATH = 'C:\mongodb\bin;' + $env:PATH; \ - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' mongod --version'; mongod --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item C:\windows\installer\*.msi -Force; \ - Remove-Item mongo.msi -Force; \ - \ - Write-Host 'Complete.'; - -# TODO docker-entrypoint.ps1 ? (for "docker run --flag --flag --flag") - -VOLUME C:\\data\\db C:\\data\\configdb - -EXPOSE 27017 -CMD ["mongod", "--bind_ip_all"] diff --git a/6.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/6.0-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 624c739a7a..0000000000 --- a/6.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] - -# https://docs.mongodb.org/master/release-notes/6.0/ -ENV MONGO_VERSION 6.0.15-rc0 -# 04/09/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e - -ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.15-rc0-signed.msi -ENV MONGO_DOWNLOAD_SHA256=56729cf4652023a9700e3ac94547ff0a31a10a4e01a7e6e66fe943a179ea643d - -RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - (New-Object System.Net.WebClient).DownloadFile($env:MONGO_DOWNLOAD_URL, 'mongo.msi'); \ - \ - if ($env:MONGO_DOWNLOAD_SHA256) { \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:MONGO_DOWNLOAD_SHA256); \ - if ((Get-FileHash mongo.msi -Algorithm sha256).Hash -ne $env:MONGO_DOWNLOAD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - }; \ - \ - Write-Host 'Installing ...'; \ -# https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/#install-mongodb-community-edition - Start-Process msiexec -Wait \ - -ArgumentList @( \ - '/i', \ - 'mongo.msi', \ - '/quiet', \ - '/qn', \ - '/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=MiscellaneousTools,Router,ServerNoService' \ - ); \ - if (-Not (Test-Path C:\mongodb\bin\mongod.exe -PathType Leaf)) { \ - Write-Host 'Installer failed!'; \ - Get-Content install.log; \ - exit 1; \ - }; \ - Remove-Item install.log; \ - \ - $env:PATH = 'C:\mongodb\bin;' + $env:PATH; \ - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' mongod --version'; mongod --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item C:\windows\installer\*.msi -Force; \ - Remove-Item mongo.msi -Force; \ - \ - Write-Host 'Complete.'; - -# TODO docker-entrypoint.ps1 ? (for "docker run --flag --flag --flag") - -VOLUME C:\\data\\db C:\\data\\configdb - -EXPOSE 27017 -CMD ["mongod", "--bind_ip_all"] diff --git a/versions.json b/versions.json index 703a356851..8ab06d8c0d 100644 --- a/versions.json +++ b/versions.json @@ -178,78 +178,7 @@ }, "version": "6.0.15" }, - "6.0-rc": { - "changes": "https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%226.0.15%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC", - "date": "04/09/2024", - "githash": "7494119c41ca4e13b493e9f048df4032164e860e", - "linux": "ubuntu2204", - "notes": "https://docs.mongodb.org/master/release-notes/6.0/", - "pgp": [ - { - "fingerprints": [ - "28DE23AF08040FB24C33F36381B0EBBBADCEA95C" - ], - "url": "https://pgp.mongodb.com/server-dev.asc" - }, - { - "fingerprints": [ - "39BD841E4BE5FB195A65400E6A26B1AE64C3C388" - ], - "url": "https://pgp.mongodb.com/server-6.0.asc" - } - ], - "targets": { - "debian10": { - "arches": [ - "amd64" - ], - "image": "debian:buster-slim", - "suite": "buster" - }, - "debian11": { - "arches": [ - "amd64" - ], - "image": "debian:bullseye-slim", - "suite": "bullseye" - }, - "ubuntu2004": { - "arches": [ - "amd64", - "arm64v8" - ], - "image": "ubuntu:focal", - "suite": "focal" - }, - "ubuntu2204": { - "arches": [ - "amd64", - "arm64v8" - ], - "image": "ubuntu:jammy", - "suite": "jammy" - }, - "windows": { - "arches": [ - "amd64" - ], - "features": [ - "MiscellaneousTools", - "Router", - "ServerNoService" - ], - "msi": "https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.15-rc0-signed.msi", - "sha256": "56729cf4652023a9700e3ac94547ff0a31a10a4e01a7e6e66fe943a179ea643d", - "variants": [ - "windowsservercore-ltsc2022", - "windowsservercore-1809", - "nanoserver-ltsc2022", - "nanoserver-1809" - ] - } - }, - "version": "6.0.15-rc0" - }, + "6.0-rc": null, "7.0": { "changes": "https://jira.mongodb.org/issues/?jql=project%20%3D%20SERVER%20AND%20fixVersion%20%3D%20%227.0.8%22%20ORDER%20BY%20status%20DESC%2C%20priority%20DESC", "date": "03/29/2024",