From fdcf9a9fea942c819dc2c71ef635a013519bb849 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Thu, 1 Nov 2018 13:05:55 -0600 Subject: [PATCH 1/5] Removed Beta disclaimer tags. --- README.md | 8 -------- develop/develop-images/build_enhancements.md | 4 ---- ee/ucp/admin/configure/collect-cluster-metrics.md | 4 ---- ee/ucp/admin/configure/create-audit-logs.md | 4 ---- ee/ucp/admin/configure/enable-saml-authentication.md | 4 ---- ee/ucp/deploy-application-package.md | 4 ---- 6 files changed, 28 deletions(-) diff --git a/README.md b/README.md index 9c7323a35b..0a4328515a 100644 --- a/README.md +++ b/README.md @@ -309,14 +309,6 @@ instance. Be sure to compress the images *before* adding them to the repository, doing it afterwards actually worsens the impact on the Git repo (but still optimizes the bandwith during browsing). -## Beta content disclaimer - -```bash -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. -``` - ## Building archives and the live published docs All the images described below are automatically built using Docker Cloud. To diff --git a/develop/develop-images/build_enhancements.md b/develop/develop-images/build_enhancements.md index 4a05f89e41..8000028839 100644 --- a/develop/develop-images/build_enhancements.md +++ b/develop/develop-images/build_enhancements.md @@ -4,10 +4,6 @@ description: Learn the new features of Docker Build keywords: build, security, engine, secret, buildkit --- -> Beta disclaimer -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - Docker Build is one of the most used features of the Docker Engine - users ranging from developers, build teams, and release teams all use Docker Build. Docker Build enhancements for 18.09 release introduces a much-needed overhaul of the build architecture. By integrating BuildKit, users should see an improvement on performance, storage management, feature functionality, and security. diff --git a/ee/ucp/admin/configure/collect-cluster-metrics.md b/ee/ucp/admin/configure/collect-cluster-metrics.md index e8df379e44..89ef13a129 100644 --- a/ee/ucp/admin/configure/collect-cluster-metrics.md +++ b/ee/ucp/admin/configure/collect-cluster-metrics.md @@ -6,10 +6,6 @@ redirect_from: - /engine/admin/prometheus/ --- -> Beta disclaimer -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - [Prometheus](https://prometheus.io/) is an open-source systems monitoring and alerting toolkit. You can configure Docker as a Prometheus target. This topic shows you how to configure Docker, set up Prometheus to run as a Docker diff --git a/ee/ucp/admin/configure/create-audit-logs.md b/ee/ucp/admin/configure/create-audit-logs.md index ffe4fd7526..103f48d96f 100644 --- a/ee/ucp/admin/configure/create-audit-logs.md +++ b/ee/ucp/admin/configure/create-audit-logs.md @@ -4,10 +4,6 @@ description: Learn how to create audit logs of all activity in UCP keywords: logs, ucp, swarm, kubernetes, audits --- -> Beta disclaimer -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - Audit logs are focused on external user/agent actions and security rather than understanding state or events of the system itself. They are a chronological record of security-relevant activities by individual users, administrators or software components that have affected the system. Audit Logs capture all HTTP actions (GET, PUT, POST, PATCH, DELETE) to all UCP API, Swarm API and Kubernetes API endpoints that are invoked (except for the ignored list) and sent to Docker Engine via stdout. Creating audit logs is CLI driven and is an UCP component that integrates with Swarm, K8s, and UCP APIs. diff --git a/ee/ucp/admin/configure/enable-saml-authentication.md b/ee/ucp/admin/configure/enable-saml-authentication.md index 653f10f62c..905e03d551 100644 --- a/ee/ucp/admin/configure/enable-saml-authentication.md +++ b/ee/ucp/admin/configure/enable-saml-authentication.md @@ -4,10 +4,6 @@ description: Learn how to configure user authentication with SAML 2.0 keywords: SAML, ucp, authentication, SSO, Okta, ADFS --- -> Beta disclaimer -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - SAML is commonly supported by enterprise authentication systems. SAML-based single sign-on (SSO) gives you access to UCP through a SAML 2.0-compliant identity provider. SAML-based single sign-on (SSO) gives you access to UCP through a SAML 2.0-compliant identity provider. UCP supports SAML for authentication as a service provider integrated with your identity provider. diff --git a/ee/ucp/deploy-application-package.md b/ee/ucp/deploy-application-package.md index 96efd9f69a..240ae4a842 100644 --- a/ee/ucp/deploy-application-package.md +++ b/ee/ucp/deploy-application-package.md @@ -4,10 +4,6 @@ description: Learn how to deploy an application package in UCP keywords: ucp, swarm, kubernetes, application, app package --- -> Beta disclaimer -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Application packages Docker Enterprise Edition 2.1 introduces application packages in Docker. With application packages, you can add metadata and settings to an existing Compose file. This gives operators more context about applications they deploy and manage. From be39f4723e0b9411939818f2dcc3ed514632cce7 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Thu, 1 Nov 2018 15:29:49 -0600 Subject: [PATCH 2/5] Update README.md Added back beta container disclaimer per @bermudezmt --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 0a4328515a..6d64ade760 100644 --- a/README.md +++ b/README.md @@ -309,6 +309,13 @@ instance. Be sure to compress the images *before* adding them to the repository, doing it afterwards actually worsens the impact on the Git repo (but still optimizes the bandwith during browsing). +## Beta content disclaimer +```bash +> BETA DISCLAIMER +> +> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. +``` + ## Building archives and the live published docs All the images described below are automatically built using Docker Cloud. To From 505551983dc45ab0e974821748fdeb0b0f95b5be Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Fri, 2 Nov 2018 09:18:18 -0600 Subject: [PATCH 3/5] Improved grep, removing more. --- ee/dtr/admin/configure/auto-delete-repo-events.md | 4 ---- ee/dtr/admin/configure/garbage-collection.md | 4 ---- ee/dtr/admin/manage-jobs/audit-jobs-via-api.md | 4 ---- ee/dtr/admin/manage-jobs/auto-delete-job-logs.md | 4 ---- 4 files changed, 16 deletions(-) diff --git a/ee/dtr/admin/configure/auto-delete-repo-events.md b/ee/dtr/admin/configure/auto-delete-repo-events.md index 54eef0316b..733f8e3136 100644 --- a/ee/dtr/admin/configure/auto-delete-repo-events.md +++ b/ee/dtr/admin/configure/auto-delete-repo-events.md @@ -4,10 +4,6 @@ description: Enable auto-deletion of image events within a repository for mainte keywords: registry, events, log, activity stream --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Overview Docker Trusted Registry has a global setting for repository event auto-deletion. This allows event records to be removed as part of [garbage collection](../admin/configure/garbage-collection.md). DTR administrators can enable auto-deletion of repository events in DTR 2.6 based on specified conditions which are covered below. diff --git a/ee/dtr/admin/configure/garbage-collection.md b/ee/dtr/admin/configure/garbage-collection.md index 1e9161ff95..c393175d12 100644 --- a/ee/dtr/admin/configure/garbage-collection.md +++ b/ee/dtr/admin/configure/garbage-collection.md @@ -5,10 +5,6 @@ description: Save disk space by configuring the garbage collection settings in keywords: registry, online garbage collection, gc, space, disk space --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - You can configure the Docker Trusted Registry (DTR) to automatically delete unused image layers, thus saving you disk space. This process is also known as garbage collection. diff --git a/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md b/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md index e3cc69440a..5477445bda 100644 --- a/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md +++ b/ee/dtr/admin/manage-jobs/audit-jobs-via-api.md @@ -6,10 +6,6 @@ redirect_from: /ee/dtr/admin/monitor-and-troubleshoot/troubleshoot-batch-jobs/ --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Overview This covers troubleshooting batch jobs via the API and was introduced in DTR 2.2. Starting in DTR 2.6, admins have the ability to [audit jobs](audit-jobs-via-ui.md) using the web interface. diff --git a/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md b/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md index 33a0202d19..b8903b7499 100644 --- a/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md +++ b/ee/dtr/admin/manage-jobs/auto-delete-job-logs.md @@ -4,10 +4,6 @@ description: Enable auto-deletion of old or unnecessary job logs for maintenance keywords: dtr, jobs, log, job logs, system --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Overview Docker Trusted Registry has a global setting for auto-deletion of job logs which allows them to be removed as part of [garbage collection](../configure/garbage-collection.md). DTR admins can enable auto-deletion of repository events in DTR 2.6 based on specified conditions which are covered below. From 61fa19ba77e0ee457553b21b678156fc0559062b Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Fri, 2 Nov 2018 09:24:30 -0600 Subject: [PATCH 4/5] Removed more beta tags --- ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md | 5 ----- ee/dtr/user/manage-images/review-repository-info.md | 4 ---- .../user/manage-repository-events/audit-repository-events.md | 4 ---- ee/dtr/user/tag-pruning.md | 4 ---- ee/ucp/kubernetes/install-cni-plugin.md | 4 ---- engine/ce-ee-node-activate.md | 4 ---- 6 files changed, 25 deletions(-) diff --git a/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md b/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md index d06a430af2..7d5f2b261b 100644 --- a/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md +++ b/ee/dtr/admin/manage-jobs/audit-jobs-via-ui.md @@ -4,11 +4,6 @@ description: View a list of jobs happening within DTR and review the detailed lo keywords: dtr, troubleshoot, audit, job logs, jobs, ui --- - -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - As of DTR 2.2, admins were able to [view and audit jobs within DTR](audit-jobs-via-api) using the API. DTR 2.6 enhances those capabilities by adding a **Job Logs** tab under **System** settings on the user interface. The tab displays a sortable and paginated list of jobs along with links to associated job logs. ## Prerequisite diff --git a/ee/dtr/user/manage-images/review-repository-info.md b/ee/dtr/user/manage-images/review-repository-info.md index be2523c6e1..1b4715e954 100644 --- a/ee/dtr/user/manage-images/review-repository-info.md +++ b/ee/dtr/user/manage-images/review-repository-info.md @@ -4,10 +4,6 @@ description: View your repository permissions. keywords: dtr, repository, permissions --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - The **Repository Info** tab includes the following details: * README (which you can [edit if you have admin rights to the repository](../../admin/manage-users/permission-levels/#team-permission-levels)) * Docker Pull Command diff --git a/ee/dtr/user/manage-repository-events/audit-repository-events.md b/ee/dtr/user/manage-repository-events/audit-repository-events.md index 70ff0296b6..e489c367b2 100644 --- a/ee/dtr/user/manage-repository-events/audit-repository-events.md +++ b/ee/dtr/user/manage-repository-events/audit-repository-events.md @@ -4,10 +4,6 @@ description: View and audit your repository events. keywords: dtr, events, log, activity stream --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Overview Starting in DTR 2.6, each repository page includes an **Activity** tab which displays a sortable and paginated list of the most recent events within the repository. This offers better visibility along with the ability to audit events. Event types listed will vary according to your [repository permission level](../../admin/manage-users/permission-levels/). Additionally, DTR admins can [enable auto-deletion of repository events](../../admin/configure/auto-delete-repo-events/) as part of maintenance and cleanup. diff --git a/ee/dtr/user/tag-pruning.md b/ee/dtr/user/tag-pruning.md index 4b21f11a4a..a12fbccac6 100644 --- a/ee/dtr/user/tag-pruning.md +++ b/ee/dtr/user/tag-pruning.md @@ -4,10 +4,6 @@ description: Skip the management headache of deciding which tags to delete or pr keywords: registry, tag pruning, tag limit, repo management --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - ## Overview Tag pruning is the process of cleaning up unnecessary or unwanted repository tags. As of v2.6, you can configure the Docker Trusted Registry (DTR) to automatically perform tag pruning on repositories that you manage by: diff --git a/ee/ucp/kubernetes/install-cni-plugin.md b/ee/ucp/kubernetes/install-cni-plugin.md index b41c5bb84e..4929cb30af 100644 --- a/ee/ucp/kubernetes/install-cni-plugin.md +++ b/ee/ucp/kubernetes/install-cni-plugin.md @@ -4,10 +4,6 @@ description: Learn how to install a Container Networking Interface plugin on Doc keywords: ucp, cli, administration, kubectl, Kubernetes, cni, Container Networking Interface, flannel, weave, ipip, calico --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - For Docker Universal Control Plane, [Project Calico](https://docs.projectcalico.org/v3.0/introduction/) provides the secure networking functionality for the container communication with Kubernetes. diff --git a/engine/ce-ee-node-activate.md b/engine/ce-ee-node-activate.md index 166febef48..5b5a7fc455 100644 --- a/engine/ce-ee-node-activate.md +++ b/engine/ce-ee-node-activate.md @@ -4,10 +4,6 @@ keywords: Engine, CE, EE, node, activation, enterprise title: CE-EE Node Activate --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - The Docker Engine `18.09` release introduces a new feature called **CE-EE Node Activate**, which allows a user to perform an in-place seamless activation of the Enterprise engine feature set on an existing Community Edition (CE) node through the Docker command line. CE-EE Node Activate will apply a license, and switch the Docker engine to the Enterprise engine binary. From 9417008906163f7853e0ee1d87b1f7017c74e357 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Fri, 2 Nov 2018 09:28:22 -0600 Subject: [PATCH 5/5] Last of the files. --- engine/ce-ee-node-activate.md | 2 +- engine/swarm/join-nodes.md | 4 ---- install/linux/docker-ee/rhel.md | 4 ---- install/windows/docker-ee.md | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/engine/ce-ee-node-activate.md b/engine/ce-ee-node-activate.md index 5b5a7fc455..ce938f8d32 100644 --- a/engine/ce-ee-node-activate.md +++ b/engine/ce-ee-node-activate.md @@ -85,7 +85,7 @@ Login Succeeded ``` $ sudo docker engine activate --license ee-engine-license-1000-nodes.lic License: Quantity: 400 Nodes Expiration date: 2019-05-12 License is currently active -18.09.0-beta: resolved +18.09.0: resolved e3cba72cdf2e: done [==================================================>] 434B/434B 3642e2b52398: done [==================================================>] 1.161kB/1.161kB eb6fe2abc4ad: done [==================================================>] 4.544MB/4.544MB diff --git a/engine/swarm/join-nodes.md b/engine/swarm/join-nodes.md index c2a91d53ee..f5d8a267d1 100644 --- a/engine/swarm/join-nodes.md +++ b/engine/swarm/join-nodes.md @@ -4,10 +4,6 @@ keywords: guide, swarm mode, node title: Join nodes to a swarm --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - When you first create a swarm, you place a single Docker Engine into swarm mode. To take full advantage of swarm mode you can add nodes to the swarm: diff --git a/install/linux/docker-ee/rhel.md b/install/linux/docker-ee/rhel.md index 686e3faafc..a03af13f6e 100644 --- a/install/linux/docker-ee/rhel.md +++ b/install/linux/docker-ee/rhel.md @@ -9,10 +9,6 @@ redirect_from: title: Get Docker EE for Red Hat Enterprise Linux --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - {% assign linux-dist = "rhel" %} {% assign linux-dist-cap = "RHEL" %} {% assign linux-dist-url-slug = "rhel" %} diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index 45471d02c4..31825607a8 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -7,10 +7,6 @@ redirect_from: - /engine/installation/windows/docker-ee/ --- -> BETA DISCLAIMER -> -> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice. - {% capture filename %}{{ page.win_latest_build }}.zip{% endcapture %} {% capture download_url %}https://download.docker.com/components/engine/windows-server/{{ site.docker_ee_version }}/{{ filename }}{% endcapture %} Docker Enterprise Edition for Windows Server (*Docker EE*) enables native Docker containers on Windows Server. Windows Server 2016 and later versions are supported. The Docker EE installation package includes everything you need to run Docker on Windows Server. This topic describes pre-install considerations, and how to download and install Docker EE.