-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update gradle extraDirectory config parameter to include path and per…
…missions field (#1178)
- Loading branch information
Showing
25 changed files
with
349 additions
and
81 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
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
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
88 changes: 88 additions & 0 deletions
88
...adle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtraDirectoryParameters.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,88 @@ | ||
| /* | ||
| * 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 com.google.cloud.tools.jib.gradle; | ||
|
|
||
| import com.google.cloud.tools.jib.plugins.common.ConfigurationPropertyValidator; | ||
| import com.google.cloud.tools.jib.plugins.common.PropertyNames; | ||
| import java.io.File; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import javax.inject.Inject; | ||
| import org.gradle.api.tasks.Input; | ||
| import org.gradle.api.tasks.Internal; | ||
|
|
||
| /** Object in {@link JibExtension} that configures the extra directory. */ | ||
| public class ExtraDirectoryParameters { | ||
|
|
||
| private static Path resolveDefaultExtraDirectory(Path projectDirectory) { | ||
| return projectDirectory.resolve("src").resolve("main").resolve("jib"); | ||
| } | ||
|
|
||
| private Path path; | ||
| private Map<String, String> permissions = Collections.emptyMap(); | ||
|
|
||
| @Inject | ||
| public ExtraDirectoryParameters(Path projectDirectory) { | ||
| path = resolveDefaultExtraDirectory(projectDirectory); | ||
| } | ||
|
|
||
| @Input | ||
| public String getPathString() { | ||
| // Gradle warns about @Input annotations on File objects, so we have to expose a getter for a | ||
| // String to make them go away. | ||
| if (System.getProperty(PropertyNames.EXTRA_DIRECTORY_PATH) != null) { | ||
| return System.getProperty(PropertyNames.EXTRA_DIRECTORY_PATH); | ||
| } | ||
| return path.toString(); | ||
| } | ||
|
|
||
| @Internal | ||
| public Path getPath() { | ||
| // Gradle warns about @Input annotations on File objects, so we have to expose a getter for a | ||
| // String to make them go away. | ||
| if (System.getProperty(PropertyNames.EXTRA_DIRECTORY_PATH) != null) { | ||
| return Paths.get(System.getProperty(PropertyNames.EXTRA_DIRECTORY_PATH)); | ||
| } | ||
| return path; | ||
| } | ||
|
|
||
| public void setPath(File path) { | ||
| this.path = path.toPath(); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the permissions for files in the extra layer on the container. Maps from absolute path on | ||
| * the container to a 3-digit octal string representation of the file permission bits (e.g. {@code | ||
| * "/path/on/container" -> "755"}). | ||
| * | ||
| * @return the permissions map from path on container to file permissions | ||
| */ | ||
| @Input | ||
| public Map<String, String> getPermissions() { | ||
| if (System.getProperty(PropertyNames.EXTRA_DIRECTORY_PERMISSIONS) != null) { | ||
| return ConfigurationPropertyValidator.parseMapProperty( | ||
| System.getProperty(PropertyNames.EXTRA_DIRECTORY_PERMISSIONS)); | ||
| } | ||
| return permissions; | ||
| } | ||
|
|
||
| public void setPermissions(Map<String, String> permissions) { | ||
| this.permissions = permissions; | ||
| } | ||
| } |
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
Oops, something went wrong.