docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/docker.github.io

This commit is contained in:
Maria Bermudez 2019-03-28 12:40:32 -07:00
parent 4d0acc44c4 3b6af13488
commit 5b44abaa5a
4 changed files with 10 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Jenkinsfile vendored
View File

@ -1,95 +0,0 @@
def dtrVpnAddress = "vpn.corp-us-east-1.aws.dckr.io"
def ucpBundle = [file(credentialsId: "ucp-bundle", variable: 'UCP')]
def slackString = [string(credentialsId: 'slack-docs-webhook', variable: 'slack')]
def reg = [credentialsId: 'csebuildbot', url: 'https://index.docker.io/v1/']
pipeline {
agent none
options {
timeout(time: 1, unit: 'HOURS')
}
stages {
stage( 'docs-private' ) {
agent {
label 'ubuntu-1604-aufs-stable'
}
when {
expression { env.GIT_URL == 'https://github.com/docker/docs-private.git' }
}
stages {
stage( 'build and push new beta-stage image' ) {
when {
branch 'amberjack'
}
steps {
sh 'echo "Build and push new beta-stage image here"'
withDockerRegistry(reg) {
sh """
docker image build --tag docs/docs-private:beta-stage-${env.BUILD_NUMBER} . && \
docker image push docs/docs-private:beta-stage-${env.BUILD_NUMBER}
"""
}
}
}
stage( 'build and push new beta image' ) {
when {
branch 'published'
}
steps {
sh 'echo "Build and push new beta image here"'
withDockerRegistry(reg) {
sh """
docker image build --tag docs/docs-private:beta-${env.BUILD_NUMBER} . && \
docker image push docs/docs-private:beta-${env.BUILD_NUMBER}
"""
}
}
}
stage( 'update beta-stage service' ) {
when {
branch 'amberjack'
}
steps {
sh 'echo "Update beta-stage service here"'
withVpn(dtrVpnAddress) {
withCredentials(ucpBundle) {
sh 'unzip -o $UCP'
}
withDockerRegistry(reg) {
sh """
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443
docker service update --detach=false --force --image docs/docs-private:beta-stage-${env.BUILD_NUMBER} docs-beta-stage-docker-com_docs --with-registry-auth
"""
}
}
}
}
stage( 'update beta service' ) {
when {
branch 'published'
}
steps {
sh 'echo "Update beta service here"'
withVpn(dtrVpnAddress) {
withCredentials(ucpBundle) {
sh 'unzip -o $UCP'
}
withDockerRegistry(reg) {
sh """
export DOCKER_TLS_VERIFY=1
export COMPOSE_TLS_VERSION=TLSv1_2
export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443
docker service update --detach=false --force --image docs/docs-private:beta-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
"""
}
}
}
}
}
}
}
}

4
ee/dtr/release-notes.md
View File

@ -23,7 +23,7 @@ to upgrade your installation to the latest release.
# Version 2.6
## 2.6.4
(2019-3-27)
(2019-3-28)
### Enhancements
@ -221,7 +221,7 @@ to upgrade your installation to the latest release.
## 2.5.10
(2019-3-27)
(2019-3-28)
### Bug Fixes

22
ee/ucp/release-notes.md
View File

@ -22,27 +22,26 @@ upgrade your installation to the latest release.
# Version 3.1
## 3.1.5
2019-03-28
2019-03-27
### Kubernetes
### Kubernetes
* Updated Kubernetes to version 1.11.8. (ENGORC-2024)
### Networking
### Networking
* Updated Calico to version 3.5.2. (ENGORC-2045)
### Authentication and Authorization
### Authentication and Authorization
* Added LDAP Settings API to the list of publicly documented API endpoints. (ENGORC-98)
* Added a new `exclude_server_identity_headers` field to the UCP config. If set to true, the headers are not included in UCP API responses. (docker/orca#16039)
* Hid most of the UCP banners for non-admin users. (docker/orca#14631)
* When LDAP or SAML is enabled, provided admin users an option to disable managed password authentication, which includes login and creation of new users. (ENGORC-1999)
### Bug Fixes
### Bug Fixes
* Changed Interlock proxy service default `update-action-failure` to rollback. (ENGCORE-117)
* Added validation for service configuration label values. (ENGCORE-114)
* Fixed an issue with continuous interlock reconciliation if `ucp-interlock` service image does not match expected version. (ENGORC-2081)
### Known Issues
### Known Issues
* There are important changes to the upgrade process that, if not correctly followed, can impact the availability of applications running on the Swarm during uprades. These constraints impact any upgrades coming from any Docker Engine version before 18.09 to version 18.09 or greater. For more information about about upgrading Docker Enterprise to version 2.1, see [Upgrade Docker](../upgrade)
* You must use the ID of the user, organization, or team if you manually create a **ClusterRoleBinding** or **RoleBinding** for `User` or `Group` subjects. (#14935)
* For the `User` subject Kind, the `Name` field contains the ID of the user.
@ -69,15 +68,6 @@ upgrade your installation to the latest release.
| Calico | 3.5.2 |
| Interlock (nginx) | 1.14.0 |
### Components
| Component | Version |
| ----------- | ----------- |
| UCP | 3.1.5 |
| Kubernetes | 1.11.8 |
| Calico | 3.5.2 |
| Interlock (nginx) | 1.14.0 |
## 3.1.4
2019-02-28

4
engine/release-notes.md
View File

@ -31,7 +31,7 @@ consistency and compatibility reasons.
## 18.09.4
2019-03-27
2019-03-28
### Builder
@ -286,7 +286,7 @@ Ubuntu 14.04 "Trusty Tahr" [docker-ce-packaging#255](https://github.com/docker/d
## 18.03.1-ee-8
2019-03-27
2019-03-28
### Builder