Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Allow to configure noCache option for openshift docker build strategy #1466

Merged
merged 6 commits into from
Jan 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
* Fix 690: Removes deprecated _legacyPortMapping_ property.
* Fix 1458: Support for from Image configuration in openshift docker build strategy
* Fix 732: Added 'skip' options to goals.
* Fix 1466: Allow to configure noCache option for openshift docker build strategy

### 4.0.0-M2 (2018-12-14)
* Fix 10: Make VolumeConfiguration more flexible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ private BuildStrategy createBuildStrategy(ImageConfiguration imageConfig, OpenSh
.withName(fromName)
.withNamespace(StringUtils.isEmpty(fromNamespace) ? null : fromNamespace)
.endFrom()
.withNoCache(checkForNocache(imageConfig))
.endDockerStrategy().build();

if (openshiftPullSecret != null) {
Expand Down Expand Up @@ -353,6 +354,16 @@ private BuildStrategy createBuildStrategy(ImageConfiguration imageConfig, OpenSh
}
}

private Boolean checkForNocache(ImageConfiguration imageConfig) {
String nocache = System.getProperty("docker.nocache");
if (nocache != null) {
return nocache.length() == 0 || Boolean.valueOf(nocache);
} else {
BuildImageConfiguration buildConfig = imageConfig.getBuildConfiguration();
return buildConfig.getNoCache();
}
}

private Boolean checkOrCreatePullSecret(BuildServiceConfig config, OpenShiftClient client, KubernetesListBuilder builder, String pullSecretName, ImageConfiguration imageConfig)
throws MojoExecutionException, UnsupportedEncodingException {
io.fabric8.maven.docker.service.BuildService.BuildContext dockerBuildContext = config.getDockerBuildContext();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,15 @@ public void testDockerBuildFromExt() throws Exception {
.name(projectName)
.buildConfig(new BuildImageConfiguration.Builder()
.fromExt(fromExt)
.nocache(Boolean.TRUE)
.build()
).build();

service.build(fromExtImage);

assertTrue(mockServer.getRequestCount() > 8);
collector.assertEventsRecordedInOrder("build-config-check", "new-build-config", "pushed");
assertEquals("{\"apiVersion\":\"build.openshift.io/v1\",\"kind\":\"BuildConfig\",\"metadata\":{\"annotations\":{},\"labels\":{},\"name\":\"myapp-docker\"},\"spec\":{\"nodeSelector\":{},\"output\":{\"to\":{\"kind\":\"ImageStreamTag\",\"name\":\"myapp:latest\"}},\"source\":{\"type\":\"Binary\"},\"strategy\":{\"dockerStrategy\":{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"app:1.2-1\",\"namespace\":\"my-project\"}},\"type\":\"Docker\"},\"triggers\":[]}}", collector.getBodies().get(1));
assertEquals("{\"apiVersion\":\"build.openshift.io/v1\",\"kind\":\"BuildConfig\",\"metadata\":{\"annotations\":{},\"labels\":{},\"name\":\"myapp-docker\"},\"spec\":{\"nodeSelector\":{},\"output\":{\"to\":{\"kind\":\"ImageStreamTag\",\"name\":\"myapp:latest\"}},\"source\":{\"type\":\"Binary\"},\"strategy\":{\"dockerStrategy\":{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"app:1.2-1\",\"namespace\":\"my-project\"},\"noCache\":true},\"type\":\"Docker\"},\"triggers\":[]}}", collector.getBodies().get(1));
collector.assertEventsNotRecorded("patch-build-config");
bTestComplete = true;
} catch (Fabric8ServiceException exception) {
Expand Down