iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-19 06:21:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,742 Commits 346 Branches 147 Tags
3d225357423949f36bcf91c8aecda84ff2eabade
Commit Graph
188 Commits
Author SHA1 Message Date
Megan Marsh 140785f088 make sure we create the temp dir explicitly when we are setting up the config dir in docker. Otherwise, we create it with root later on and it causes permissions failures. 2019-07-24 16:51:38 -07:00
Megan Marsh eb8c74bf85 allow ssh_host config option to override host logic for all builders 2019-07-02 13:56:28 -07:00
Megan Marsh 8d5ecb9514 fix bug where ReadAll on the stderr pipe was causing an infinite hang because there was no stderr to report 2019-06-28 16:23:28 -07:00
Adrien Delorme 2da36b7374 builder/docker: default container dir to "c:/packer-files" on windows 2019-05-22 16:55:26 +02:00
Megan Marsh 71f2017209 read stderr before we try to read the artchive. 2019-04-16 13:05:25 -07:00
Adrien Delorme 63f5bbbc73 use our own copy of iochan.LineReader 2019-04-11 14:25:24 +02:00
Adrien Delorme 6ff392d713 Update windows_container_communicator.go 
after merge
 2019-04-09 17:46:38 +02:00
Adrien Delorme f555e7a9f2 allow a provisioner to timeout 
* I had to contextualise Communicator.Start and RemoteCmd.StartWithUi
NOTE: Communicator.Start starts a RemoteCmd but RemoteCmd.StartWithUi will run the cmd and wait for a return, so I renamed StartWithUi to RunWithUi so that the intent is clearer.
Ideally in the future RunWithUi will be named back to StartWithUi and the exit status or wait funcs of the command will allow to wait for a return. If you do so please read carrefully https://golang.org/pkg/os/exec/#Cmd.Stdout to avoid a deadlock
* cmd.ExitStatus to cmd.ExitStatus() is now blocking to avoid race conditions
* also had to simplify StartWithUi
 2019-04-08 20:09:21 +02:00
Adrien Delorme a81abd297b Merge remote-tracking branch 'origin/master' into context_provisioner 2019-04-08 20:09:01 +02:00
Adrien Delorme c4f3dccc14 rename interpolation context from ctx to ictx and contexts to ctx to avoid conflicts 2019-04-03 15:56:15 +02:00
Adrien Delorme a4bf94dd3c change Builder to be passed a context for cancellation 
we have to to give it to our hook
 2019-04-03 15:55:55 +02:00
Megan Marsh af06334114 fix tests 2019-03-29 11:37:23 -07:00
Megan Marsh 6407a579f0 Document why we need windows communicator in code 2019-03-29 11:21:07 -07:00
Megan Marsh 12b9004c76 reduce duplicated code 2019-03-29 11:14:01 -07:00
Megan Marsh 0860edeed8 fix mocks 2019-03-28 16:55:35 -07:00
Megan Marsh 70150ffa0f set powershell entrypoint for windows containers 2019-03-28 16:46:07 -07:00
Megan Marsh 36f2634352 can't use docker cp so call powershell to do this natively. Fix implementation for upload, uploadDir, and download in windows container communicator 2019-03-28 16:20:05 -07:00
Megan Marsh af01860fa9 remove old docker-toolbox limitation. 2019-03-27 15:29:22 -07:00
Megan Marsh 3b87f2a519 stop container before committing if windows 2019-03-27 15:25:51 -07:00
Megan Marsh 8f3313d81e Create new docker communicator for windows containers 2019-03-27 15:25:32 -07:00
Adrien Delorme 9f82b75e57 Use the hashicorp/go-getter to download files 
* removed packer.Cache and references since packer.Cache is never used except in the download step. The download step now uses the new func packer.CachePath(targetPath) for this, the behavior is the same.
* removed download code from packer that was reimplemented into the go-getter library: progress bar, http download restart, checksuming from file, skip already downloaded files, symlinking, make a download cancellable by context.
* on windows if packer is running without symlinking rights and we are getting a local file, the file will be copied instead to avoid errors.
* added unit tests for step_download that are now CI tested on windows, mac & linux.
* files are now downloaded under cache dir `sha1(filename + "?checksum=" + checksum) + file_extension`
* since the output dir is based on the source url and the checksum, when the checksum fails, the file is auto deleted.
* a download file is protected and locked by a file lock,
* updated docs
* updated go modules and vendors
 2019-03-13 12:11:58 +01:00
Megan Marsh 3b6ff0fe3e Merge pull request #7106 from hashicorp/revert_docker_changes 
docker: user /bin/sh by default
 2019-02-28 15:31:53 -08:00
Adrien Delorme f57953d4ff Docker needs a temporary dir that is inside the $HOME dir 2019-01-18 16:42:04 +01:00
Adrien Delorme 9f7b4ffc17 Merge branch 'master' into pr/6950 2019-01-09 10:11:18 +01:00
Ladar Levison 6ac5971288 Fixed cmd order for docker driver. Added config to post proc. 2018-12-17 22:59:41 -06:00
Ladar Levison 10095678c8 Adding driver changes. 2018-12-17 22:37:32 -06:00
Ladar Levison 21fdbadf04 Adding changes to import prototype. 2018-12-17 22:35:59 -06:00
Ladar Levison 050f809a1c Add changes var to docker driver import func. 2018-12-17 22:04:43 -06:00
Adrien Delorme 2718a5ed62 Revert "revert changes to docker entrypoint; since this is a backwards-breaking change it needs to wait for a minor release" 
This reverts commit 2a79d64ae0.
 2018-12-13 10:23:46 +01:00
Megan Marsh 2a79d64ae0 revert changes to docker entrypoint; since this is a backwards-breaking change it needs to wait for a minor release 2018-12-12 15:30:24 -08:00
Adrien DelormeandMatthew Patton b7222d1f56 Add tmp package that offers Dir & File funcs 
this regroups the calls of tmp func calls into one package.
the tmp pkg allows to store tmp files under a common directory for easier managment

Squashed commit of the following:
commit 74b674c015
Merge: fc94b5714 66001525d
Author: Matthew Patton <[email protected]>
Date:   Fri Nov 2 02:02:38 2018 -0400

    Merge branch 'remove_TMPDIR_docs' of github.com:tb3088/packer into remove_TMPDIR_docs

commit fc94b57142
Author: Matthew Patton <[email protected]>
Date:   Fri Nov 2 01:42:38 2018 -0400

    update tests to honor configured temporary directory

commit 5a562359f4
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 18:52:38 2018 -0400

    sync straggler to refactor. implement tests at packer/configfile instead of buried in docker.

commit 9d5a4a0935
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 15:39:46 2018 -0400

    insert URL to GoLang API for os.TempDir()

commit fbae4c2e05
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 07:41:29 2018 -0400

    revise documentation to match code

commit 3590fae8bd
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 07:21:59 2018 -0400

    refacter config_file. replace all hard-coded os.TempDir with wrapper

commit d5c5306a97
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 20:11:36 2018 -0400

    close massive file overwrite hole with TempDir

commit 0a72297da8
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 01:06:00 2018 -0400

    adjust var declaration scope

commit 20f68228b6
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 00:54:35 2018 -0400

    use mktemp() equivalent to create temporary directory

commit c73ebe3d83
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 20:40:58 2018 -0400

    remove extraneous variable declaration, fix FOR loop

commit 63549b8bd7
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 19:30:44 2018 -0400

    match styistic convension with rest of docs

commit 9761010749
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 19:08:39 2018 -0400

    revert dangling config file change

commit 95159afbc0
Author: Matthew Patton <[email protected]>
Date:   Fri Dec 29 23:53:43 2017 -0500

    replace invalid TMPDIR variable wth PACKER_TMP_DIR.
    update ConfigTmpDir() to try common temporary paths first and
    only write to configDir() as a last resort.

commit 66001525d7
Author: Matthew Patton <[email protected]>
Date:   Fri Nov 2 01:42:38 2018 -0400

    update tests to honor configured temporary directory

commit e9b6adefea
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 18:52:38 2018 -0400

    sync straggler to refactor. implement tests at packer/configfile instead of buried in docker.

commit 852113ed07
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 15:39:46 2018 -0400

    insert URL to GoLang API for os.TempDir()

commit 54add38d1d
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 07:41:29 2018 -0400

    revise documentation to match code

commit 6b5b8f6d4e
Author: Matthew Patton <[email protected]>
Date:   Thu Nov 1 07:21:59 2018 -0400

    refacter config_file. replace all hard-coded os.TempDir with wrapper

commit c22092c601
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 20:11:36 2018 -0400

    close massive file overwrite hole with TempDir

commit 7a73045091
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 01:06:00 2018 -0400

    adjust var declaration scope

commit 0f2933adb6
Author: Matthew Patton <[email protected]>
Date:   Wed Oct 31 00:54:35 2018 -0400

    use mktemp() equivalent to create temporary directory

commit d74839ede0
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 20:40:58 2018 -0400

    remove extraneous variable declaration, fix FOR loop

commit eb65416619
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 19:30:44 2018 -0400

    match styistic convension with rest of docs

commit acaa2b31ed
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 19:08:39 2018 -0400

    revert dangling config file change

commit e573fde668
Author: Matthew Patton <[email protected]>
Date:   Fri Dec 29 23:53:43 2017 -0500

    replace invalid TMPDIR variable wth PACKER_TMP_DIR.
    update ConfigTmpDir() to try common temporary paths first and
    only write to configDir() as a last resort.

commit 39a9874afc
Merge: 8a413cfe8 3315812c2
Author: Matthew Patton <[email protected]>
Date:   Tue Oct 30 18:19:26 2018 -0400

    Merge branch 'master' of https://github.com/hashicorp/packer into prestine

commit 8a413cfe83
Merge: e07491de5 4e14710a6
Author: Matthew Patton <[email protected]>
Date:   Mon Oct 1 20:18:10 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit e07491de59
Merge: 42610a35d a1fa35dff
Author: Matthew Patton <[email protected]>
Date:   Tue Aug 21 13:26:19 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit 42610a35d5
Merge: 5298142da 0d63cf7bc
Author: Matthew Patton <[email protected]>
Date:   Tue Jun 19 22:45:05 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit 5298142da6
Merge: 7bb110bc7 9d9736552
Author: Matthew Patton <[email protected]>
Date:   Mon Jun 11 15:10:09 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit 7bb110bc74
Merge: a61c869ca 6189d66e7
Author: Matthew Patton <[email protected]>
Date:   Wed May 9 23:41:22 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit a61c869ca7
Merge: 098101dd9 4be5f072c
Author: Matthew Patton <[email protected]>
Date:   Fri May 4 10:13:04 2018 -0400

    Merge remote-tracking branch 'upstream/master' into prestine

commit 098101dd99
Merge: fefaf0fa6 554b2b4a5
Author: Matthew Patton <[email protected]>
Date:   Tue May 1 20:52:30 2018 -0400

    Merge branch 'EOL-handling' into prestine

Co-Authored-By: Matthew Patton <[email protected]>
 2018-12-12 16:35:57 +01:00
Ali Rizvi-Santiago a6af04417e Moved the entrypoint argument for the docker builder in front of the image so it's passed correctly as an argument. 2018-12-10 15:09:56 -06:00
Ali Rizvi-Santiago 2e977019e4 Modified the docker builder's default run_command to specify the shell via the entrypoint command line argument as suggested by @vrubiolo in #6920. 2018-12-04 23:52:17 -06:00
Ali Rizvi-Santiago 310ea6c006 Updated docker's default config to use regular bourne shell instead of bourne again. Closes #6920. 2018-12-04 18:28:48 -06:00
Megan Marsh 38cc525ec7 new option allowing user to clean up the ephemeral ssh key from the authorized_keys file 2018-09-14 11:06:38 -07:00
Adrien Delorme 61480f41dc fix some go vet issues in tests ( composite literal uses unkeyed fields ) 2018-08-31 11:54:12 +02:00
Adrien Delorme 41f6e0334d refactor all copy pasted sshConfig with into communicator.Config.SSHConfigFunc 
* still need to append the auth methods into an array for gracefullness
 2018-08-22 17:02:23 +02:00
Megan Marsh ee1ff3132d remove attempt to discover whether destination is a directory from upload function in various communicators 2018-04-10 08:13:06 -07:00
Matthew Hooker ff64ccda55 Merge pull request #5426 from hashicorp/fix_4915 
Fix 4915
 2018-02-05 14:54:27 -08:00
Matthew Hooker 8cd403425e test fixes WIP 2018-01-24 17:09:17 -08:00
Matthew Hooker 7a189a83a1 fix imports 
`find . -type f -name '*.go' -not -path "./vendor/*" -exec goimports -w {} \;`
 2018-01-24 17:09:17 -08:00
Matthew Hooker a831d522be change run signatures 
Run now takes a context as well as a statebag. We'll assign the context
to the blank identifier to prevent namespace collisions. We'll let the
step authors opt-in to using the context.

`find . -iname "step_*.go" -exec gsed -i'' 's/func \(.*\)Run(/func \1Run(_ context.Context, /' {} \;`
 2018-01-24 17:09:17 -08:00
Matthew Hooker 366dc3da0a move multistep imports to helper. 
gomvpkg -from "github.com/mitchellh/multistep" -to "github.com/hashicorp/packer/helper/multistep"
 2018-01-24 17:09:15 -08:00
Matthew Hooker ebe995c0ff run goimports 2018-01-22 17:21:10 -08:00
Krzysztof Wilczynski 567b566c23 docker: Remove AWS credentials and Session Token from being shown in the log. 
Signed-off-by: Krzysztof Wilczynski <[email protected]>
 2017-12-10 20:55:03 +01:00
Matthew Hooker b07a0cd6f0 fix tests 
always sort telemetry options
 2017-11-14 16:39:03 -08:00
Matthew Hooker 1901c0385f remove login_email from docker 
adds fixer
removes documentation
removes from docker builder and docker-push pp
 2017-10-25 10:53:06 -07:00
Aaron Browne ffc63a8724 Use amazon common AccessConfig for ecr_login 
Signed-off-by: Aaron Browne <[email protected]>
 2017-10-17 15:00:19 -04:00
Aaron Browne 8df643c343 Add aws_profile option to docker-push ecr_login 
An aws_profile option is added to the AWS ECR login credentials
configuration to allow using shared AWS credentials stored in
a non-default profile.

Signed-off-by: Aaron Browne <[email protected]>
 2017-10-16 16:55:34 -04:00
localghost 5866d4ea24 Move container user inspect to StepConnectDocker. 2017-10-10 22:45:47 +02:00