forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support jib extra directories feature
Resolves: quarkusio#8936
- Loading branch information
Showing
9 changed files
with
211 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...yment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerBuilderHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package io.quarkus.container.image.jib.deployment; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.FileSystems; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.PathMatcher; | ||
| import java.nio.file.Paths; | ||
| import java.time.Instant; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
| import java.util.function.BiFunction; | ||
|
|
||
| import com.google.cloud.tools.jib.api.JavaContainerBuilder; | ||
| import com.google.cloud.tools.jib.api.buildplan.AbsoluteUnixPath; | ||
| import com.google.cloud.tools.jib.api.buildplan.FileEntriesLayer; | ||
| import com.google.cloud.tools.jib.api.buildplan.FilePermissions; | ||
| import com.google.cloud.tools.jib.filesystem.DirectoryWalker; | ||
|
|
||
| /** | ||
| * Copied almost verbatim from Jib's {@code com.google.cloud.tools.jib.plugins.common.JavaContainerBuilderHelper} | ||
| * because the module that contains it is internal to Jib | ||
| */ | ||
| final class ContainerBuilderHelper { | ||
|
|
||
| private ContainerBuilderHelper() { | ||
| } | ||
|
|
||
| /** | ||
| * Returns a {@link FileEntriesLayer} for adding the extra directory to the container. | ||
| * | ||
| * @param sourceDirectory the source extra directory path | ||
| * @param targetDirectory the root directory on the container to place the files in | ||
| * @param extraDirectoryPermissions map from path on container to file permissions | ||
| * @param modificationTimeProvider file modification time provider | ||
| * @return a {@link FileEntriesLayer} for adding the extra directory to the container | ||
| * @throws IOException if walking the extra directory fails | ||
| */ | ||
| public static FileEntriesLayer extraDirectoryLayerConfiguration( | ||
| Path sourceDirectory, | ||
| AbsoluteUnixPath targetDirectory, | ||
| Map<String, FilePermissions> extraDirectoryPermissions, | ||
| BiFunction<Path, AbsoluteUnixPath, Instant> modificationTimeProvider) | ||
| throws IOException { | ||
| FileEntriesLayer.Builder builder = FileEntriesLayer.builder() | ||
| .setName(JavaContainerBuilder.LayerType.EXTRA_FILES.getName()); | ||
| Map<PathMatcher, FilePermissions> pathMatchers = new LinkedHashMap<>(); | ||
| for (Map.Entry<String, FilePermissions> entry : extraDirectoryPermissions.entrySet()) { | ||
| pathMatchers.put( | ||
| FileSystems.getDefault().getPathMatcher("glob:" + entry.getKey()), entry.getValue()); | ||
| } | ||
|
|
||
| new DirectoryWalker(sourceDirectory) | ||
| .filterRoot() | ||
| .walk( | ||
| localPath -> { | ||
| AbsoluteUnixPath pathOnContainer = targetDirectory.resolve(sourceDirectory.relativize(localPath)); | ||
| Instant modificationTime = modificationTimeProvider.apply(localPath, pathOnContainer); | ||
| FilePermissions permissions = extraDirectoryPermissions.get(pathOnContainer.toString()); | ||
| if (permissions == null) { | ||
| // Check for matching globs | ||
| Path containerPath = Paths.get(pathOnContainer.toString()); | ||
| for (Map.Entry<PathMatcher, FilePermissions> entry : pathMatchers.entrySet()) { | ||
| if (entry.getKey().matches(containerPath)) { | ||
| builder.addEntry( | ||
| localPath, pathOnContainer, entry.getValue(), modificationTime); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| // Add with default permissions | ||
| if (localPath.toFile().canExecute()) { | ||
| // make sure we can execute the file in the container | ||
| builder.addEntry(localPath, pathOnContainer, FilePermissions.fromOctalString("754"), | ||
| modificationTime); | ||
| } else { | ||
| builder.addEntry(localPath, pathOnContainer, modificationTime); | ||
| } | ||
| } else { | ||
| // Add with explicit permissions | ||
| builder.addEntry(localPath, pathOnContainer, permissions, modificationTime); | ||
| } | ||
| }); | ||
| return builder.build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <artifactId>quarkus-container-image-parent</artifactId> | ||
| <groupId>io.quarkus</groupId> | ||
| <version>999-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>quarkus-container-image-util</artifactId> | ||
| <name>Quarkus - Container - Image - Util</name> | ||
| <description>Utility classes common to the container image extensions</description> | ||
|
|
||
| </project> |
31 changes: 31 additions & 0 deletions
31
extensions/container-image/util/src/main/java/io/quarkus/container/util/PathsUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package io.quarkus.container.util; | ||
|
|
||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.AbstractMap; | ||
|
|
||
| public final class PathsUtil { | ||
|
|
||
| private PathsUtil() { | ||
| } | ||
|
|
||
| /** | ||
| * Return a Map.Entry (which is used as a Tuple) containing the main sources root as the key | ||
| * and the project root as the value | ||
| */ | ||
| public static AbstractMap.SimpleEntry<Path, Path> findMainSourcesRoot(Path outputDirectory) { | ||
| Path currentPath = outputDirectory; | ||
| do { | ||
| Path toCheck = currentPath.resolve(Paths.get("src", "main")); | ||
| if (toCheck.toFile().exists()) { | ||
| return new AbstractMap.SimpleEntry<>(toCheck, currentPath); | ||
| } | ||
| if (Files.exists(currentPath.getParent())) { | ||
| currentPath = currentPath.getParent(); | ||
| } else { | ||
| return null; | ||
| } | ||
| } while (true); | ||
| } | ||
| } |