Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
1fbcd835
Commit
1fbcd835
authored
Dec 29, 2014
by
Ross Smith II
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1712 from gotcha/patch-1
Escapes cp alias, fixes #1656
parents
92ca3767
f52283d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
builder/docker/communicator.go
builder/docker/communicator.go
+2
-2
No files found.
builder/docker/communicator.go
View file @
1fbcd835
...
...
@@ -75,7 +75,7 @@ func (c *Communicator) Upload(dst string, src io.Reader, fi *os.FileInfo) error
// Copy the file into place by copying the temporary file we put
// into the shared folder into the proper location in the container
cmd
:=
&
packer
.
RemoteCmd
{
Command
:
fmt
.
Sprintf
(
"cp %s/%s %s"
,
c
.
ContainerDir
,
Command
:
fmt
.
Sprintf
(
"c
ommand c
p %s/%s %s"
,
c
.
ContainerDir
,
filepath
.
Base
(
tempfile
.
Name
()),
dst
),
}
...
...
@@ -166,7 +166,7 @@ func (c *Communicator) UploadDir(dst string, src string, exclude []string) error
// Make the directory, then copy into it
cmd
:=
&
packer
.
RemoteCmd
{
Command
:
fmt
.
Sprintf
(
"set -e; mkdir -p %s; cp -R %s/* %s"
,
Command
:
fmt
.
Sprintf
(
"set -e; mkdir -p %s; c
ommand c
p -R %s/* %s"
,
containerDst
,
containerSrc
,
containerDst
),
}
if
err
:=
c
.
Start
(
cmd
);
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment