Merge pull request #7417 from dokku/7336-copy-from-image
Write contents to stdout before writing to a file
This commit is contained in:
1 file changed
+64
-9
@@ -1,7 +1,10 @@
|
|||||||
package common
|
package common
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -104,14 +107,6 @@ func CopyFromImage(appName string, image string, source string, destination stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpFile, err := os.CreateTemp(os.TempDir(), fmt.Sprintf("dokku-%s-%s", MustGetEnv("DOKKU_PID"), "CopyFromImage"))
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Cannot create temporary file: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
defer tmpFile.Close()
|
|
||||||
defer os.Remove(tmpFile.Name())
|
|
||||||
|
|
||||||
globalRunArgs := MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
|
globalRunArgs := MustGetEnv("DOKKU_GLOBAL_RUN_ARGS")
|
||||||
createLabelArgs := []string{"--label", fmt.Sprintf("com.dokku.app-name=%s", appName), globalRunArgs}
|
createLabelArgs := []string{"--label", fmt.Sprintf("com.dokku.app-name=%s", appName), globalRunArgs}
|
||||||
containerID, err := DockerContainerCreate(image, createLabelArgs)
|
containerID, err := DockerContainerCreate(image, createLabelArgs)
|
||||||
@@ -125,7 +120,7 @@ func CopyFromImage(appName string, image string, source string, destination stri
|
|||||||
// ref: https://github.com/dotcloud/docker/issues/3986
|
// ref: https://github.com/dotcloud/docker/issues/3986
|
||||||
result, err := CallExecCommand(ExecCommandInput{
|
result, err := CallExecCommand(ExecCommandInput{
|
||||||
Command: DockerBin(),
|
Command: DockerBin(),
|
||||||
Args: []string{"container", "cp", fmt.Sprintf("%s:%s", containerID, source), tmpFile.Name()},
|
Args: []string{"container", "cp", "--quiet", fmt.Sprintf("%s:%s", containerID, source), "-"},
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Unable to copy file %s from image: %w", source, err)
|
return fmt.Errorf("Unable to copy file %s from image: %w", source, err)
|
||||||
@@ -134,6 +129,36 @@ func CopyFromImage(appName string, image string, source string, destination stri
|
|||||||
return fmt.Errorf("Unable to copy file %s from image: %v", source, result.StderrContents())
|
return fmt.Errorf("Unable to copy file %s from image: %v", source, result.StderrContents())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tarContents := result.StdoutContents()
|
||||||
|
if tarContents == "" {
|
||||||
|
return fmt.Errorf("Unable to copy file %s from image", source)
|
||||||
|
}
|
||||||
|
|
||||||
|
// extract the contents via tar
|
||||||
|
content, err := extractTarToString(tarContents)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Unable to extract contents from tar: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tmpFile, err := os.CreateTemp(os.TempDir(), fmt.Sprintf("dokku-%s-%s", MustGetEnv("DOKKU_PID"), "CopyFromImage"))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Cannot create temporary file: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
if err := tmpFile.Close(); err != nil {
|
||||||
|
LogWarn(fmt.Sprintf("Unable to close temporary file: %v", err))
|
||||||
|
}
|
||||||
|
if err := os.Remove(tmpFile.Name()); err != nil {
|
||||||
|
LogWarn(fmt.Sprintf("Unable to remove temporary file: %v", err))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// write contents to tmpFile
|
||||||
|
if _, err := tmpFile.Write([]byte(content)); err != nil {
|
||||||
|
return fmt.Errorf("Unable to write to temporary file: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
fi, err := os.Stat(tmpFile.Name())
|
fi, err := os.Stat(tmpFile.Name())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -172,6 +197,36 @@ func CopyFromImage(appName string, image string, source string, destination stri
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Function to extract tar contents and return them as a string
|
||||||
|
func extractTarToString(in string) (string, error) {
|
||||||
|
// Initialize a buffer to accumulate the extracted content
|
||||||
|
var extractedContent bytes.Buffer
|
||||||
|
|
||||||
|
// Create a tar reader from standard input
|
||||||
|
tarReader := tar.NewReader(strings.NewReader(in))
|
||||||
|
|
||||||
|
// Iterate through the files in the tar archive
|
||||||
|
for {
|
||||||
|
// Read the next header (file entry)
|
||||||
|
_, err := tarReader.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
break // End of archive
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("error reading tar header: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write the content of the current file into the buffer
|
||||||
|
_, err = io.Copy(&extractedContent, tarReader)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("error copying file content: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the accumulated content as a string
|
||||||
|
return strings.TrimSpace(extractedContent.String()), nil
|
||||||
|
}
|
||||||
|
|
||||||
// DockerBin returns a string which contains a path to the current docker binary
|
// DockerBin returns a string which contains a path to the current docker binary
|
||||||
func DockerBin() string {
|
func DockerBin() string {
|
||||||
dockerBin := os.Getenv("DOCKER_BIN")
|
dockerBin := os.Getenv("DOCKER_BIN")
|
||||||
|
|||||||
Reference in new issue
Block a user