ADD command #58
ADD command #58
Conversation
pkg/util/command_util.go
Outdated
| @@ -160,10 +170,31 @@ func DestinationFilepath(filename, srcName, dest, cwd, buildcontext string) (str | |||
| return filepath.Join(cwd, dest), nil | |||
| } | |||
|
|
|||
| // URLDestinationFilepath gives the destintion a file from a remote URL should be saved to | |||
| return err | ||
| } | ||
| if util.IsSrcRemoteFileURL(file) { | ||
| urlDest := util.URLDestinationFilepath(file, dest, config.WorkingDir) |
There was a problem hiding this comment.
nit: Might be worth splitting these three cases into 3 helper functions to shorten ExecuteCommand a bit
There was a problem hiding this comment.
Since we need access to the file, srcMap, destination, and config I figured it would make more sense to keep it in this function, instead of passing all those in as arguments
| @@ -22,6 +22,8 @@ import ( | |||
| "testing" | |||
| ) | |||
|
|
|||
| var testUrl = "https://github.com/GoogleCloudPlatform/runtimes-common/blob/master/LICENSE" | |||
There was a problem hiding this comment.
nit: might make more sense to depend on something in k8s-container-builder but this is probably fine
There was a problem hiding this comment.
nit: ideally the tests would not require pinging an actual URL, you can mock the response and retrieve the file that way. not necessary though
There was a problem hiding this comment.
Yah I'd have liked to use something in this repo as well but it's still private
pkg/util/tar_util.go
Outdated
| @@ -86,3 +92,83 @@ func checkHardlink(p string, i os.FileInfo) (bool, string) { | |||
| } | |||
| return hardlink, linkDst | |||
| } | |||
|
|
|||
| //UnpackLocalTarArchive unpacks the tar archive at path to the directory dest | |||
| // Returns true if the path was acutally unpacked | |||
There was a problem hiding this comment.
Nits: Space after // for comment, actually
priyawadhwa
added
the
area/dockerfile-command
The add command first resolves any environment variables and wildcards in the list of sources. It then passes through each source, unpacking it if it's a local tar archive or downloading it if it's a remote file URL. It removes these sources from the list of sources, and with any remaining "normal" sources it executes a standard copy command.
Fixes #3
Partially fixes #43