Skip to content

Commit

Permalink
Keep the timestamps when copying jars and building JIB layers
Browse files Browse the repository at this point in the history 
Note that I was a bit surprised that we are copying some transformed
jars in the lib/main directory.
Apparently, only jars for which we remove entries.
From my tests, the entry removal is reproducible and always produces the
exact same binary so I suppose it's good enough.

Fixes #39130
  • Loading branch information
@gsmet
gsmet committed Mar 4, 2024
1 parent 78ece28 commit e5eb989
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 18 deletions.
8 changes: 6 additions & 2 deletions core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,9 +926,11 @@ private void copyDependency(Set<ArtifactKey> parentFirstArtifacts, OutputTargetB
}
}
if (removedFromThisArchive.isEmpty()) {
Files.copy(resolvedDep, targetPath, StandardCopyOption.REPLACE_EXISTING);
Files.copy(resolvedDep, targetPath, StandardCopyOption.REPLACE_EXISTING,
StandardCopyOption.COPY_ATTRIBUTES);
} else {
//we have removed classes, we need to handle them correctly
// we copy jars for which we remove entries to the same directory
// which seems a bit odd to me
filterZipFile(resolvedDep, targetPath, removedFromThisArchive);
}
}
Expand Down Expand Up @@ -1251,6 +1253,8 @@ private void filterZipFile(Path resolvedDep, Path targetPath, Set<String> transf
}
}
}
// let's make sure we keep the original timestamp
Files.setLastModifiedTime(targetPath, Files.getLastModifiedTime(resolvedDep));
}
} catch (IOException e) {
throw new RuntimeException(e);
Expand Down
38 changes: 22 additions & 16 deletions ...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,13 +529,14 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag

try {
Instant now = Instant.now();
boolean enforceModificationTime = !jibConfig.useCurrentTimestampFileModification;
Instant modificationTime = jibConfig.useCurrentTimestampFileModification ? now : Instant.EPOCH;

JibContainerBuilder jibContainerBuilder = toJibContainerBuilder(baseJvmImage, jibConfig);
if (fastChangingLibPaths.isEmpty()) {
// just create a layer with the entire lib structure intact
addLayer(jibContainerBuilder, Collections.singletonList(componentsPath.resolve(JarResultBuildStep.LIB)),
workDirInContainer, "fast-jar-lib", isMutableJar, modificationTime);
workDirInContainer, "fast-jar-lib", isMutableJar, enforceModificationTime, modificationTime);
} else {
// we need to manually create each layer
// the idea here is that the fast changing libraries are created in a later layer, thus when they do change,
Expand All @@ -549,14 +550,9 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag
AbsoluteUnixPath libPathInContainer = workDirInContainer.resolve(JarResultBuildStep.LIB)
.resolve(JarResultBuildStep.BOOT_LIB)
.resolve(lib.getFileName());
if (appCDSResult.isPresent()) {
// the boot lib jars need to preserve the modification time because otherwise AppCDS won't work
bootLibsLayerBuilder.addEntry(lib, libPathInContainer,
Files.getLastModifiedTime(lib).toInstant());
} else {
bootLibsLayerBuilder.addEntry(lib, libPathInContainer);
}

// the boot lib jars need to preserve the modification time because otherwise AppCDS won't work
bootLibsLayerBuilder.addEntry(lib, libPathInContainer,
Files.getLastModifiedTime(lib).toInstant());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
Expand All @@ -569,15 +565,15 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag
.resolve(JarResultBuildStep.DEPLOYMENT_LIB);
addLayer(jibContainerBuilder, Collections.singletonList(deploymentPath),
workDirInContainer.resolve(JarResultBuildStep.LIB),
"fast-jar-deployment-libs", true, modificationTime);
"fast-jar-deployment-libs", true, enforceModificationTime, modificationTime);
}

AbsoluteUnixPath libsMainPath = workDirInContainer.resolve(JarResultBuildStep.LIB)
.resolve(JarResultBuildStep.MAIN);
addLayer(jibContainerBuilder, nonFastChangingLibPaths, libsMainPath, "fast-jar-normal-libs",
isMutableJar, modificationTime);
isMutableJar, enforceModificationTime, modificationTime);
addLayer(jibContainerBuilder, new ArrayList<>(fastChangingLibPaths), libsMainPath, "fast-jar-changing-libs",
isMutableJar, modificationTime);
isMutableJar, enforceModificationTime, modificationTime);
}

if (appCDSResult.isPresent()) {
Expand All @@ -601,9 +597,9 @@ private JibContainerBuilder createContainerBuilderFromFastJar(String baseJvmImag
}

addLayer(jibContainerBuilder, Collections.singletonList(componentsPath.resolve(JarResultBuildStep.APP)),
workDirInContainer, "fast-jar-quarkus-app", isMutableJar, modificationTime);
workDirInContainer, "fast-jar-quarkus-app", isMutableJar, enforceModificationTime, modificationTime);
addLayer(jibContainerBuilder, Collections.singletonList(componentsPath.resolve(JarResultBuildStep.QUARKUS)),
workDirInContainer, "fast-jar-quarkus", isMutableJar, modificationTime);
workDirInContainer, "fast-jar-quarkus", isMutableJar, enforceModificationTime, modificationTime);
if (ContainerImageJibConfig.DEFAULT_WORKING_DIR.equals(jibConfig.workingDirectory)) {
// this layer ensures that the working directory is writeable
// see https://github.com/GoogleContainerTools/jib/issues/1270
Expand Down Expand Up @@ -667,15 +663,25 @@ private boolean containsRunJava(String baseJvmImage) {

public JibContainerBuilder addLayer(JibContainerBuilder jibContainerBuilder, List<Path> files,
AbsoluteUnixPath pathInContainer, String name, boolean isMutableJar,
Instant now)
boolean enforceModificationTime, Instant forcedModificationTime)
throws IOException {
FileEntriesLayer.Builder layerConfigurationBuilder = FileEntriesLayer.builder().setName(name);

for (Path file : files) {
layerConfigurationBuilder.addEntryRecursive(
file, pathInContainer.resolve(file.getFileName()),
isMutableJar ? REMOTE_DEV_FOLDER_PERMISSIONS_PROVIDER : DEFAULT_FILE_PERMISSIONS_PROVIDER,
(sourcePath, destinationPath) -> now,
(sourcePath, destinationPath) -> {
if (enforceModificationTime) {
return forcedModificationTime;
}

try {
return Files.getLastModifiedTime(sourcePath).toInstant();
} catch (IOException e) {
throw new RuntimeException("Unable to get last modified time for " + sourcePath, e);
}
},
isMutableJar ? REMOTE_DEV_OWNERSHIP_PROVIDER : DEFAULT_OWNERSHIP_PROVIDER);
}

Expand Down

0 comments on commit e5eb989

Please sign in to comment.