Removed publish logic that triggered dotnet-preview Docker builds. This logic has been moved to Maestro.
This commit is contained in:
parent
3af43c8669
commit
c622debad0
2 changed files with 1 additions and 49 deletions
|
@ -2,14 +2,8 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net.Http;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using Microsoft.DotNet.Cli.Build.Framework;
|
using Microsoft.DotNet.Cli.Build.Framework;
|
||||||
using Microsoft.WindowsAzure.Storage;
|
|
||||||
using Microsoft.WindowsAzure.Storage.Blob;
|
|
||||||
|
|
||||||
using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers;
|
|
||||||
|
|
||||||
namespace Microsoft.DotNet.Cli.Build
|
namespace Microsoft.DotNet.Cli.Build
|
||||||
{
|
{
|
||||||
|
@ -44,7 +38,6 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
[Target(nameof(PrepareTargets.Init),
|
[Target(nameof(PrepareTargets.Init),
|
||||||
nameof(PublishTargets.InitPublish),
|
nameof(PublishTargets.InitPublish),
|
||||||
nameof(PublishTargets.PublishArtifacts),
|
nameof(PublishTargets.PublishArtifacts),
|
||||||
nameof(PublishTargets.TriggerDockerHubBuilds),
|
|
||||||
nameof(PublishTargets.FinalizeBuild))]
|
nameof(PublishTargets.FinalizeBuild))]
|
||||||
[Environment("PUBLISH_TO_AZURE_BLOB", "1", "true")] // This is set by CI systems
|
[Environment("PUBLISH_TO_AZURE_BLOB", "1", "true")] // This is set by CI systems
|
||||||
public static BuildTargetResult Publish(BuildTargetContext c)
|
public static BuildTargetResult Publish(BuildTargetContext c)
|
||||||
|
@ -295,45 +288,6 @@ namespace Microsoft.DotNet.Cli.Build
|
||||||
return c.Success();
|
return c.Success();
|
||||||
}
|
}
|
||||||
|
|
||||||
[Target]
|
|
||||||
[Environment("DOCKER_HUB_REPO")]
|
|
||||||
[Environment("DOCKER_HUB_TRIGGER_TOKEN")]
|
|
||||||
public static BuildTargetResult TriggerDockerHubBuilds(BuildTargetContext c)
|
|
||||||
{
|
|
||||||
string dockerHubRepo = Environment.GetEnvironmentVariable("DOCKER_HUB_REPO");
|
|
||||||
string dockerHubTriggerToken = Environment.GetEnvironmentVariable("DOCKER_HUB_TRIGGER_TOKEN");
|
|
||||||
|
|
||||||
Uri baseDockerHubUri = new Uri("https://registry.hub.docker.com/u/");
|
|
||||||
Uri dockerHubTriggerUri;
|
|
||||||
if (!Uri.TryCreate(baseDockerHubUri, $"{dockerHubRepo}/trigger/{dockerHubTriggerToken}/", out dockerHubTriggerUri))
|
|
||||||
{
|
|
||||||
return c.Failed("Invalid DOCKER_HUB_REPO and/or DOCKER_HUB_TRIGGER_TOKEN");
|
|
||||||
}
|
|
||||||
|
|
||||||
c.Info($"Triggering automated DockerHub builds for {dockerHubRepo}");
|
|
||||||
using (HttpClient client = new HttpClient())
|
|
||||||
{
|
|
||||||
StringContent requestContent = new StringContent("{\"build\": true}", Encoding.UTF8, "application/json");
|
|
||||||
try
|
|
||||||
{
|
|
||||||
HttpResponseMessage response = client.PostAsync(dockerHubTriggerUri, requestContent).Result;
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
sb.AppendLine($"HTTP request to {dockerHubTriggerUri.ToString()} was unsuccessful.");
|
|
||||||
sb.AppendLine($"Response status code: {response.StatusCode}. Reason phrase: {response.ReasonPhrase}.");
|
|
||||||
sb.Append($"Respone content: {response.Content.ReadAsStringAsync().Result}");
|
|
||||||
return c.Failed(sb.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (AggregateException e)
|
|
||||||
{
|
|
||||||
return c.Failed($"HTTP request to {dockerHubTriggerUri.ToString()} failed. {e.ToString()}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return c.Success();
|
|
||||||
}
|
|
||||||
|
|
||||||
[Target(nameof(PrepareTargets.Init))]
|
[Target(nameof(PrepareTargets.Init))]
|
||||||
public static BuildTargetResult UpdateVersionsRepo(BuildTargetContext c)
|
public static BuildTargetResult UpdateVersionsRepo(BuildTargetContext c)
|
||||||
{
|
{
|
||||||
|
|
|
@ -123,8 +123,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
|
||||||
-e REPO_SERVER \
|
-e REPO_SERVER \
|
||||||
-e DOTNET_BUILD_SKIP_CROSSGEN \
|
-e DOTNET_BUILD_SKIP_CROSSGEN \
|
||||||
-e PUBLISH_TO_AZURE_BLOB \
|
-e PUBLISH_TO_AZURE_BLOB \
|
||||||
-e DOCKER_HUB_REPO \
|
|
||||||
-e DOCKER_HUB_TRIGGER_TOKEN \
|
|
||||||
-e NUGET_FEED_URL \
|
-e NUGET_FEED_URL \
|
||||||
-e NUGET_API_KEY \
|
-e NUGET_API_KEY \
|
||||||
-e GITHUB_PASSWORD \
|
-e GITHUB_PASSWORD \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue