Skip to content

Commit 4d04332

Browse files
arturcicarturcic
committed
(buid) adjusted docker build
1 parent 2498b14 commit 4d04332

File tree

11 files changed

+35
-21
lines changed

11 files changed

+35
-21
lines changed

‎.github/workflows/ci.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ env:
2525
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2626
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2727
DOTNET_NOLOGO: 1
28-
ENABLED_MULTI_STAGE_BUILD: true
29-
ENABLED_UNIT_TESTS: true
30-
ENABLED_PUBLISH_DOCKER: true
31-
ENABLED_PUBLISH_NUGET: true
32-
ENABLED_PUBLISH_CHOCOLATEY: true
33-
ENABLED_PUBLISH_RELEASE: true
28+
3429
ENABLED_DIAGNOSTICS: ${{ secrets.ENABLED_DIAGNOSTICS }}
3530

3631
jobs:
@@ -269,9 +264,28 @@ jobs:
269264
name: nuget
270265
path: ${{ github.workspace }}/artifacts/packages/nuget
271266
-
272-
name: '[Docker Build/Test/Publish]'
267+
name: Login to DockerHub
268+
if: success() && github.event_name != 'pull_request'
269+
uses: docker/login-action@v1
270+
with:
271+
username: ${{ secrets.DOCKER_USERNAME }}
272+
password: ${{ secrets.DOCKER_PASSWORD }}
273+
-
274+
name: '[Docker Build/Test/Publish] DockerHub'
275+
shell: pwsh
276+
run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
277+
-
278+
name: Login to GitHub Container Registry
279+
if: success() && github.event_name != 'pull_request'
280+
uses: docker/login-action@v1
281+
with:
282+
registry: ghcr.io
283+
username: ${{ github.repository_owner }}
284+
password: ${{ secrets.GITHUB_TOKEN }}
285+
-
286+
name: '[Docker Build/Test/Publish] GitHub Docker'
273287
shell: pwsh
274-
run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
288+
run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
275289

276290
publish:
277291
name: Publish

‎build/artifacts/BuildLifetime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ public override void Setup(BuildContext context)
1515

1616
context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
1717

18-
var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.GitHub);
18+
var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
1919
var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
2020
var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
2121

2222
var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
2323
var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
2424

25-
var registry = dockerRegistry == DockerRegistry.GitHub ? Constants.GitHubContainerRegistry : Constants.DockerHubRegistry;
25+
var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
2626
context.Images = from version in versions
2727
from distro in distros
2828
select new DockerImage(distro, version, registry, true);

‎build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks
55
{
66
[TaskName(nameof(ArtifactsDotnetToolTest))]
77
[TaskDescription("Tests the dotnet global tool in docker container")]
8-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
8+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
99
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1010
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1111
[IsDependentOn(typeof(ArtifactsPrepare))]

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks
55
{
66
[TaskName(nameof(ArtifactsMsBuildCoreTest))]
77
[TaskDescription("Tests the msbuild package in docker container")]
8-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
8+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
99
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1010
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1111
[IsDependentOn(typeof(ArtifactsPrepare))]

‎build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks
55
{
66
[TaskName(nameof(ArtifactsNativeTest))]
77
[TaskDescription("Tests the native executables in docker container")]
8-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
8+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
99
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1010
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1111
[IsDependentOn(typeof(ArtifactsPrepare))]

‎build/artifacts/Tasks/ArtifactsPrepare.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Artifacts.Tasks
55
{
66
[TaskName(nameof(ArtifactsPrepare))]
77
[TaskDescription("Pulls the docker images needed for testing the artifacts")]
8-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
8+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
99
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1010
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1111
public class ArtifactsPrepare : FrostingTask<BuildContext>

‎build/artifacts/Tasks/ArtifactsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ namespace Artifacts.Tasks
55
{
66
[TaskName(nameof(ArtifactsTest))]
77
[TaskDescription("Tests packages in docker container")]
8-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
8+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
99
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1010
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
11-
// [IsDependentOn(typeof(ArtifactsNativeTest))]
11+
[IsDependentOn(typeof(ArtifactsNativeTest))]
1212
[IsDependentOn(typeof(ArtifactsDotnetToolTest))]
1313
[IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]
1414
public class ArtifactsTest : FrostingTask<BuildContext>

‎build/docker/BuildLifetime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ public override void Setup(BuildContext context)
1616

1717
context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
1818

19-
var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.GitHub);
19+
var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
2020
var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
2121
var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
2222

2323
var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
2424
var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
2525

26-
var registry = dockerRegistry == DockerRegistry.GitHub ? Constants.GitHubContainerRegistry : Constants.DockerHubRegistry;
26+
var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
2727
context.Images = from version in versions
2828
from distro in distros
2929
select new DockerImage(distro, version, registry, false);

‎build/docker/Tasks/DockerBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Docker.Tasks
77
{
88
[TaskName(nameof(DockerBuild))]
99
[TaskDescription("Build the docker images containing the GitVersion Tool")]
10-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
10+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
1111
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1212
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1313
public class DockerBuild : FrostingTask<BuildContext>

‎build/docker/Tasks/DockerPublish.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Docker.Tasks
77
{
88
[TaskName(nameof(DockerPublish))]
99
[TaskDescription("Publish the docker images containing the GitVersion Tool")]
10-
[TaskArgument(Arguments.DockerRegistry, Constants.GitHub, Constants.DockerHub)]
10+
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
1111
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version31)]
1212
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
1313
[IsDependentOn(typeof(DockerPublishInternal))]

0 commit comments

Comments
 (0)