Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename BuildTarballAndLoadDockerStep to LoadDockerStep #559

Merged
merged 2 commits into from
Jul 11, 2018
Merged

Rename BuildTarballAndLoadDockerStep to LoadDockerStep #559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb1012
Rename BuildTarballAndLoadDockerStep to LoadDockerStep
TadCordle Jul 11, 2018
e3cc43c
Rename methods
TadCordle Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../steps/BuildTarballAndLoadDockerStep.java → ...ols/jib/builder/steps/LoadDockerStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import java.util.concurrent.ExecutionException;

/** Adds image layers to a tarball and loads into Docker daemon. */
class BuildTarballAndLoadDockerStep implements AsyncStep<Void>, Callable<Void> {
class LoadDockerStep implements AsyncStep<Void>, Callable<Void> {

private final BuildConfiguration buildConfiguration;
private final PullAndCacheBaseImageLayersStep pullAndCacheBaseImageLayersStep;
Expand All @@ -42,7 +42,7 @@ class BuildTarballAndLoadDockerStep implements AsyncStep<Void>, Callable<Void> {
private final ListeningExecutorService listeningExecutorService;
private final ListenableFuture<Void> listenableFuture;

BuildTarballAndLoadDockerStep(
LoadDockerStep(
ListeningExecutorService listeningExecutorService,
BuildConfiguration buildConfiguration,
PullAndCacheBaseImageLayersStep pullAndCacheBaseImageLayersStep,
Expand Down
8 changes: 4 additions & 4 deletions jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/StepsRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class StepsRunner {
@Nullable private BuildImageStep buildImageStep;
@Nullable private PushContainerConfigurationStep pushContainerConfigurationStep;
@Nullable private PushImageStep pushImageStep;
@Nullable private BuildTarballAndLoadDockerStep buildTarballAndLoadDockerStep;
@Nullable private LoadDockerStep loadDockerStep;

public StepsRunner(
BuildConfiguration buildConfiguration,
Expand Down Expand Up @@ -192,8 +192,8 @@ public StepsRunner runPushImageStep() {
}

public StepsRunner runBuildTarballAndLoadDockerStep() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this method be renamed? Hmm, I guess not as it will need to build the tarball when that is separated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah good catch, this should probably be renamed. We ended up agreeing on just creating a separate step instead of splitting this one up - #502 (comment)

buildTarballAndLoadDockerStep =
new BuildTarballAndLoadDockerStep(
loadDockerStep =
new LoadDockerStep(
listeningExecutorService,
buildConfiguration,
Preconditions.checkNotNull(pullAndCacheBaseImageLayersStep),
Expand All @@ -208,7 +208,7 @@ public void waitOnPushImageStep() throws ExecutionException, InterruptedExceptio

public void waitOnBuildTarballAndLoadDockerStep()
Copy link
Member

@briandealwis briandealwis Jul 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And same again. (this was meant to reference #559 (comment))

throws ExecutionException, InterruptedException {
Preconditions.checkNotNull(buildTarballAndLoadDockerStep).getFuture().get();
Preconditions.checkNotNull(loadDockerStep).getFuture().get();
}

/**
Expand Down