UNCLASSIFIED

Commit b9773bd4 authored by thomas.shepherd's avatar thomas.shepherd
Browse files

Merge branch 'development' into 'master'

Merge Development into Master

See merge request !15
parents 87fd13b5 9b995571
Pipeline #467149 failed with stages
in 60 minutes and 14 seconds
...@@ -6,7 +6,7 @@ ARG BASE_TAG=8.4 ...@@ -6,7 +6,7 @@ ARG BASE_TAG=8.4
ARG MONGODB_VERSION0=4.2.13 ARG MONGODB_VERSION0=4.2.13
ARG MONGODB_VERSION1=4.2.14 ARG MONGODB_VERSION1=4.2.14
ARG MONGODB_VERSION2=4.4.4 ARG MONGODB_VERSION2=4.4.4
ARG MONGODB_VERSION3=4.4.5 ARG MONGODB_VERSION3=4.4.6
FROM quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:${MONGODB_VERSION0} as official0 FROM quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:${MONGODB_VERSION0} as official0
FROM quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:${MONGODB_VERSION1} as official1 FROM quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:${MONGODB_VERSION1} as official1
...@@ -29,7 +29,7 @@ COPY --from=official3 /binaries/ /binaries/ ...@@ -29,7 +29,7 @@ COPY --from=official3 /binaries/ /binaries/
# and the number in this configuration is not relevant. # and the number in this configuration is not relevant.
USER 2000 USER 2000
ENTRYPOINT ["/bin/cp", "-a", "/binaries/*", "/mongodb-ops-manager/mongodb-releases/"] ENTRYPOINT ["/bin/cp", "-r", "/binaries/.", "/tmp"]
HEALTHCHECK --timeout=30s CMD ls /binaries/ || exit 1 HEALTHCHECK --timeout=30s CMD ls /binaries/ || exit 1
# Before You Begin # # Before You Begin #
**PRIOR TO UTILIZING THE MONGODB ENTERPRISE ADVANCED CONTAINERS, CONTACT YOUR MONGODB SALES REPRESENTATIVE.** YOUR USE OF THE MONGODB ENTERPRISE SERVER IS SUBJECT TO THE TERMS AND CONDITIONS OF THE AGREEMENT BETWEEN USAF AND THE APPLICABLE RESELLER OF THE MONGODB ENTERPRISE SERVER. SUCH AGREEMENT INCORPORATES THE TERMS & CONDITIONS OF THE MONGODB ENTERPRISE ADVANCED LICENSE AGREEMENT, THE VERSION OF WHICH CURRENT AS OF SEPTEMBER 2020 IS SET FORTH BELOW. THE MONGODB ENTERPRISE ADVANCED LICENSE AGREEMENT IS SUBJECT TO AMENDMENT AND MODIFICATION FROM TIME TO TIME. **PRIOR TO UTILIZING THESE MONGODB ENTERPRISE ADVANCED CONTAINERS, CONTACT YOUR MONGODB SALES REPRESENTATIVE.** YOUR USE OF THE MONGODB ENTERPRISE SERVER IS SUBJECT TO THE TERMS AND CONDITIONS OF THE AGREEMENT BETWEEN USAF AND THE APPLICABLE RESELLER OF THE MONGODB ENTERPRISE SERVER. SUCH AGREEMENT INCORPORATES THE TERMS & CONDITIONS OF THE MONGODB ENTERPRISE ADVANCED LICENSE AGREEMENT, THE VERSION OF WHICH CURRENT AS OF SEPTEMBER 2020 IS SET FORTH BELOW. THE MONGODB ENTERPRISE ADVANCED LICENSE AGREEMENT IS SUBJECT TO AMENDMENT AND MODIFICATION FROM TIME TO TIME.
# Contact Information # # Contact Information #
...@@ -20,6 +20,8 @@ The Mongo DB Enterprise Kubernetes Operator provides the necessary functionality ...@@ -20,6 +20,8 @@ The Mongo DB Enterprise Kubernetes Operator provides the necessary functionality
The MongoDB Enterprise Kubernetes Operator works in conjunction with MongoDB Ops Manager, which must itself be deployed to the Kubernetes cluster or stood up separately. In addition to providing the necessary automation services, Ops Manager provides additional management capabilities such as metrics, monitoring, alerting, backups, performance optimization, and more. The MongoDB Enterprise Kubernetes Operator works in conjunction with MongoDB Ops Manager, which must itself be deployed to the Kubernetes cluster or stood up separately. In addition to providing the necessary automation services, Ops Manager provides additional management capabilities such as metrics, monitoring, alerting, backups, performance optimization, and more.
This container provides a subset of MongoDB database binaries, enabling Ops Manager to deploy MongoDB database instances using Local Mode configuration (i.e. without internet connectivity). Local Mode must be configured in the Ops Manager deployment specification.
For more information about the MongoDB Enterprise Kubernetes Operator, please visit <https://docs.mongodb.com/kubernetes-operator>. For more information about the MongoDB Enterprise Kubernetes Operator, please visit <https://docs.mongodb.com/kubernetes-operator>.
For more information about MongoDB Ops Manager, please visit <https://www.mongodb.com/products/ops-manager>. For more information about MongoDB Ops Manager, please visit <https://www.mongodb.com/products/ops-manager>.
......
...@@ -37,14 +37,14 @@ labels: ...@@ -37,14 +37,14 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.4.5 - tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.4.6
url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:48572ab4f9cb5916ec141a79e39ae862f8fd8fa8d17845f3fb4902c6c0cc99da url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:649d5c7aff24bfa06619a33f59d758cd82c5205395baeb8d1045078130997906
- tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.4.4 - tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.4.4
url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:b11332ba5ab69fc0cd339a0ade11460789de4118dae9e6cd0f0cc4fcaea8e4e3 url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:1919567625ad9601cc46fb3de8d525267d568b45a7c0f4295f6c3db71253bb63
- tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.2.14 - tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.2.14
url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:a1c647f134195f5b1f65a5e34ac631448baec3eb1e76eee5aac65952ef23e1e6 url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:531ed49d3987dc97986fa2268e1222144aadbd7ec328ea15667d19c5424fea3f
- tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.2.13 - tag: quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80:4.2.13
url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:93f1edc112ae72bd5a037e86abf36d5410dc4bb1be5c9045b34ef8b30a44162f url: docker://quay.io/mongodb/mongodb-enterprise-init-mongod-rhel80@sha256:53fa1fac4cab664c6940822008667e2b7c0d8c6748aa074198a06e22cf44f0c3
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment