Skip to content

Commit

Permalink
LPS-184062 Sort
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed Aug 22, 2023
1 parent 18d3370 commit a964be1
Showing 1 changed file with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,11 @@ else if (clientExtension.type.equals("themeCSS")) {
_nodeBuildConfigurer.apply(
project, assembleClientExtensionTaskProvider);

WorkspaceExtension workspaceExtension = GradleUtil.getExtension(
(ExtensionAware)project.getGradle(), WorkspaceExtension.class);

_addDockerTasks(
project, assembleClientExtensionTaskProvider,
createClientExtensionConfigTaskProvider, workspaceExtension);
createClientExtensionConfigTaskProvider,
GradleUtil.getExtension(
(ExtensionAware)project.getGradle(), WorkspaceExtension.class));
}

@Override
Expand Down Expand Up @@ -332,15 +331,6 @@ private void _addDockerTasks(
DockerRegistryCredentials dockerRegistryCredentials =
dockerBuildImage.getRegistryCredentials();

String dockerUserName = workspaceExtension.getDockerUserName();

if (Objects.nonNull(dockerUserName)) {
Property<String> userNameProperty =
dockerRegistryCredentials.getUsername();

userNameProperty.set(dockerUserName);
}

String dockerUserAccessToken =
workspaceExtension.getDockerUserAccessToken();

Expand All @@ -350,6 +340,15 @@ private void _addDockerTasks(

passwordProperty.set(dockerUserAccessToken);
}

String dockerUserName = workspaceExtension.getDockerUserName();

if (Objects.nonNull(dockerUserName)) {
Property<String> userNameProperty =
dockerRegistryCredentials.getUsername();

userNameProperty.set(dockerUserName);
}
}

DockerRemoveImage dockerRemoveImage = GradleUtil.addTask(
Expand Down

0 comments on commit a964be1

Please sign in to comment.