From 37907216cab9f98925355948928148786ed501ab Mon Sep 17 00:00:00 2001 From: Kang Huaishuai Date: Fri, 15 May 2020 09:15:46 +0800 Subject: [PATCH] Release v19.03.10 Signed-off-by: Kang Huaishuai --- CHANGELOG.md | 2 +- kubernetes/addons/istio/README.md | 11 +++++++++++ kubernetes/docs/addons/jx.md | 7 +++++++ lnmp-docker.ps1 | 2 +- windows/lnmp-windows-pm-repo/deno/lwpm.json | 4 ++-- .../lnmp-windows-pm-repo/powershellCore/lwpm.json | 2 +- windows/sdk/dockerhub/rootfs.ps1 | 12 ++++++------ 7 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 kubernetes/addons/istio/README.md create mode 100644 kubernetes/docs/addons/jx.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c6c560bf..a288724eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Compare -* https://github.com/khs1994-docker/lnmp/compare/v19.03.9...19.03 +* https://github.com/khs1994-docker/lnmp/compare/v19.03.9...v19.03.10 ### Bug fixes: diff --git a/kubernetes/addons/istio/README.md b/kubernetes/addons/istio/README.md new file mode 100644 index 000000000..35b01c3ad --- /dev/null +++ b/kubernetes/addons/istio/README.md @@ -0,0 +1,11 @@ +# Istio + +* https://github.com/istio + +```bash +$ istioctl manifest generate +``` + +```bash +$ kubectl label namespace istio-test istio-injection=enabled +``` diff --git a/kubernetes/docs/addons/jx.md b/kubernetes/docs/addons/jx.md new file mode 100644 index 000000000..2ac256ce9 --- /dev/null +++ b/kubernetes/docs/addons/jx.md @@ -0,0 +1,7 @@ +# Jenkins-x + +## 安装 + +```bash +$ jx boot +``` diff --git a/lnmp-docker.ps1 b/lnmp-docker.ps1 index 08bf38be3..146014683 100644 --- a/lnmp-docker.ps1 +++ b/lnmp-docker.ps1 @@ -1,7 +1,7 @@ <#PSScriptInfo -.VERSION 19.03.10-alpha3 +.VERSION 19.03.10 .GUID 9769fa4f-70c7-43ed-8d2b-a0018f7dc89f diff --git a/windows/lnmp-windows-pm-repo/deno/lwpm.json b/windows/lnmp-windows-pm-repo/deno/lwpm.json index 52c842aed..afab45c57 100644 --- a/windows/lnmp-windows-pm-repo/deno/lwpm.json +++ b/windows/lnmp-windows-pm-repo/deno/lwpm.json @@ -1,8 +1,8 @@ { "name": "deno", "description": "A secure runtime for JavaScript and TypeScript built with V8, Rust, and Tokio", - "version": "1.0.0-rc2", - "pre-version": "1.0.0-rc2", + "version": "1.0.0", + "pre-version": "1.0.0", "homepage": "https://deno.land/", "bug": "https://github.com/denoland/deno/issues", "github": "denoland/deno", diff --git a/windows/lnmp-windows-pm-repo/powershellCore/lwpm.json b/windows/lnmp-windows-pm-repo/powershellCore/lwpm.json index f3565f9aa..e7321ba9a 100644 --- a/windows/lnmp-windows-pm-repo/powershellCore/lwpm.json +++ b/windows/lnmp-windows-pm-repo/powershellCore/lwpm.json @@ -1,7 +1,7 @@ { "name": "powershellCore", "description": "PowerShell is a task-based command-line shell and scripting language built on .NET", - "version": "7.0.0", + "version": "7.0.1", "pre-version": "7.1.0-preview.2", "homepage": "https://docs.microsoft.com/zh-cn/powershell", "bug": "https://github.com/PowerShell/PowerShell/issues", diff --git a/windows/sdk/dockerhub/rootfs.ps1 b/windows/sdk/dockerhub/rootfs.ps1 index 58fc9bb73..e49296244 100644 --- a/windows/sdk/dockerhub/rootfs.ps1 +++ b/windows/sdk/dockerhub/rootfs.ps1 @@ -1,5 +1,11 @@ #!/usr/bin/env pwsh +Import-Module $PSScriptRoot/tags/list.psm1 +Import-Module $PSScriptRoot/manifests/get.psm1 +Import-Module $PSScriptRoot/blobs/get.psm1 +Import-Module $PSScriptRoot\auth\token.psm1 +Import-Module $PSScriptRoot/auth/auth.psm1 + <# .SYNOPSIS download docker image rootfs @@ -17,12 +23,6 @@ #> #Requires -Version 6.0.0 -Import-Module $PSScriptRoot/tags/list.psm1 -Import-Module $PSScriptRoot/manifests/get.psm1 -Import-Module $PSScriptRoot/blobs/get.psm1 -Import-Module $PSScriptRoot\auth\token.psm1 -Import-Module $PSScriptRoot/auth/auth.psm1 - function rootfs($image="alpine", $ref="latest", $arch="amd64",