Use AbsoluteUnixPath for container.appRoot propagation #1012
Conversation
…to i964-container.appRoot
chanseokoh
changed the title
| directoryInContext.resolve( | ||
| Paths.get(copyDirective.extractionPath).relativize(layerEntry.getExtractionPath())); | ||
| Path baseExtractionPath = Paths.get(copyDirective.extractionPath.toString()); | ||
| Path relativeEntryPath = baseExtractionPath.relativize(layerEntry.getExtractionPath()); |
There was a problem hiding this comment.
Hmm, maybe we can use copyDirective.extractionPath directly and add a relativize method to AbsoluteUnixPath after we change LayerEntry#getExtractionPath to return an AbsoluteUnixPath.
| public static final String DEFAULT_RELATIVE_CLASSES_PATH_ON_IMAGE = "classes/"; | ||
| public static final String DEFAULT_RELATIVE_DEPENDENCIES_PATH_ON_IMAGE = "libs/"; | ||
| public static final RelativeUnixPath DEFAULT_RELATIVE_RESOURCES_PATH_ON_IMAGE = | ||
| RelativeUnixPath.get("resources/"); |
There was a problem hiding this comment.
Can remove the trailing slash.
| appRoot + DEFAULT_RELATIVE_DEPENDENCIES_PATH_ON_IMAGE + "*"), | ||
| appRoot.resolve(DEFAULT_RELATIVE_RESOURCES_PATH_ON_IMAGE).toString(), | ||
| appRoot.resolve(DEFAULT_RELATIVE_CLASSES_PATH_ON_IMAGE).toString(), | ||
| appRoot.resolve(DEFAULT_RELATIVE_DEPENDENCIES_PATH_ON_IMAGE).toString() + "/*"), |
There was a problem hiding this comment.
This can be appRoot.resolve(DEFAULT_RELATIVE_DEPENDENCIES_PATH_ON_IMAGE).resolve(RelativeUnixPath.get("*")).toString() to avoid the explicit string concatenation.
| COPY resources /app/resources/ | ||
| COPY classes /app/classes/ | ||
| COPY exploded-war /exploded/war/ | ||
| COPY libs /app/libs |
There was a problem hiding this comment.
I think we actually need a trailing slash.
From https://docs.docker.com/engine/reference/builder/#copy:
If <dest> does not end with a trailing slash, it will be considered a regular file and the contents of <src> will be written at <dest>.
Fixes #1011.