Skip to content

Commit

Permalink
Merge pull request #33766 from yrodiere/i33749-followup
Browse files Browse the repository at this point in the history
Remove unnecessary --pull parameter when running builder images
  • Loading branch information
yrodiere authored Jun 2, 2023
2 parents 6c7ce38 + f3f9719 commit 164d080
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -495,20 +495,14 @@ enum ImagePullStrategy {
/**
* Always pull the most recent image.
*/
ALWAYS("always"),
ALWAYS,
/**
* Only pull the image if it's missing locally.
*/
MISSING("missing"),
MISSING,
/**
* Never pull any image; fail if the image is missing locally.
*/
NEVER("never");

public final String commandLineParamValue;

ImagePullStrategy(String commandLineParamValue) {
this.commandLineParamValue = commandLineParamValue;
}
NEVER
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ protected NativeImageBuildContainerRunner(NativeConfig nativeConfig) {
this.nativeConfig = nativeConfig;
containerRuntime = nativeConfig.containerRuntime().orElseGet(ContainerRuntimeUtil::detectContainerRuntime);

this.baseContainerRuntimeArgs = new String[] { "--env", "LANG=C", "--rm",
"--pull", nativeConfig.builderImage().pull().commandLineParamValue };
this.baseContainerRuntimeArgs = new String[] { "--env", "LANG=C", "--rm" };

containerName = "build-native-" + RandomStringUtils.random(5, true, false);
}
Expand Down

0 comments on commit 164d080

Please sign in to comment.