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

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

@ -22,8 +22,7 @@ upgrade your installation to the latest release.
# Version 3.1
## 3.1.5
2019-03-27
2019-03-28
### Kubernetes
* Updated Kubernetes to version 1.11.8. (ENGORC-2024)
@ -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