Commit graph

7454 commits

Author SHA1 Message Date
Michael Schurter f85f43bdfb Consolidate envvars in a partial template 2017-06-21 17:19:08 -07:00
Michael Schurter c0eff81383 Fix Service.AddressMode changes during task updates 2017-06-21 17:19:08 -07:00
Michael Schurter 67d154a274 Test driver network advertisement and checks 2017-06-21 17:19:08 -07:00
Michael Schurter b9bfb84b53 Implement DriverNetwork and Service.AddressMode
Ideally DriverNetwork would be fully populated in Driver.Prestart, but
Docker doesn't assign the container's IP until you start the container.

However, it's important to setup the port env vars before calling
Driver.Start, so Prestart should populate that.
2017-06-21 17:19:08 -07:00
Michael Schurter 9993616e4f Merge pull request #2724 from hashicorp/b-2701-fix-server-check
Fix path used by Nomad Server HTTP Check
2017-06-21 13:09:48 -07:00
Michael Schurter 9185b21e99 docker should already be installed by services
This package no longer exists so trying to install it broke our build.
It has been renamed docker-ce.
2017-06-21 10:51:56 -07:00
Michael Schurter 95a00cbef1 Fix path used by Nomad Server HTTP Check
Fixes #2701
2017-06-21 10:41:28 -07:00
Alex Dadgar efebc29688 Merge pull request #2716 from hynek/master
Explain term signal behavior for Docker tasks
2017-06-20 12:36:42 -07:00
Hynek Schlawack dc8d7ad23d STOPSIGNAL 2017-06-17 10:17:48 +02:00
Michael Schurter 9f0918a767 Merge pull request #2717 from hashicorp/paddy_typo
Fix typo in job-dispatch docs.
2017-06-16 16:05:40 -07:00
Paddy 13bddfaa84 Fix typo in job-dispatch docs.
canidate -> candidate.
2017-06-16 16:04:12 -07:00
Michael Schurter 6d2d011809 Merge pull request #2714 from hynek/patch-2
Fix typos
2017-06-16 09:48:51 -07:00
Michael Schurter 86be49f8d7 Merge pull request #2713 from hynek/patch-1
Fix documentation of -tail/-f
2017-06-16 09:46:23 -07:00
Hynek Schlawack f002ba29d1 Explain term signal behavior for Docker tasks 2017-06-16 17:24:54 +02:00
Hynek Schlawack 59ab34c264 Fix typos 2017-06-16 16:10:12 +02:00
Hynek Schlawack e3d5c69e0b Fix documentation of -tail/-f
Previously, -tail is erroneously documented as -f and -f and -n are not documented at all. 

This patch fixes both.
2017-06-16 15:50:40 +02:00
Michael Schurter b69e060071 Log PID when sending signals 2017-06-12 11:11:36 -07:00
Alex Dadgar 7330f0dd8a Merge pull request #2693 from katiebayes/master
update middleman version 25 to 26
2017-06-12 09:15:58 +01:00
Michael Schurter ffb417a300 Merge pull request #2697 from hashicorp/b-port-map
Fix port map interpolation for docker
2017-06-09 13:29:36 -07:00
Michael Schurter d6e03b4ef4 Merge pull request #2702 from hashicorp/add-no-overlay-option
Add no overlay option
2017-06-09 12:33:46 -07:00
Michael Schurter a3827d2cc6 Fix bad merge conflict resolution 2017-06-09 10:40:47 -07:00
Michael Schurter eabd6759c6 Merge branch 'master' into add-no-overlay-option 2017-06-09 09:59:35 -07:00
Katie Bayes 129e05b77b fix middleman update to version 26 2017-06-09 08:55:05 -04:00
Alex Dadgar 2701ab3892 changelog 2017-06-08 13:36:51 -07:00
Alex Dadgar 5ba2662b30 Merge pull request #2687 from mmickan/issue-2685
Include symlinks in snapshots when migrating disks
2017-06-08 13:35:46 -07:00
Michael Schurter 784d69789e Merge branch 'master' into add-no-overlay-option 2017-06-08 13:15:56 -07:00
Michael Schurter 1feb97fb66 Merge pull request #2695 from kmalec/add-selective-insecure-options
Added insecure_options config list
2017-06-08 13:13:45 -07:00
Alex Dadgar 7695e636d5 Fix port map interpolation for docker
This PR fixes an issue in which the value of the portmap could not be
interpolated.

Fixes https://github.com/hashicorp/nomad/issues/2680
2017-06-08 13:12:32 -07:00
Karel Malec b55f4bf601 Fix backticks in docs; refine --debug comment 2017-06-07 21:11:22 +02:00
Karel Malec b714194b9d Fix the backticks 2017-06-07 20:54:21 +02:00
Karel Malec a258a803f2 Added insecure_options config list 2017-06-07 09:58:42 +02:00
Katie Bayes cae37b6f48 update middleman version 25 to 26 2017-06-06 19:59:37 -04:00
Karel Malec 1957e9dfa6 Add a no_overlay option for the rkt task config. 2017-06-07 00:17:33 +02:00
Alex Dadgar 959c055144 Merge pull request #2690 from hashicorp/d-remove-atlas-references
Remove Atlas references from docs
2017-06-06 10:46:54 -07:00
Rob Genova 5d8298290e Remove Atlas references from docs 2017-06-05 23:05:43 +00:00
Michael Schurter 37b09f3901 Bump Go to 1.8.3 in Vagrantfile 2017-06-05 10:23:36 -07:00
Mark Mickan c196d320f8 Add tests for migrating symlinks in alloc and local directories 2017-06-04 15:56:22 +09:30
Mark Mickan 236f24c9a4 Include symlinks in snapshots when migrating disks
Fixes #2685
2017-06-04 00:36:18 +09:30
Michael Schurter d1dd380890 Switch to hashicorp/go-envparse 2017-06-02 15:58:52 -07:00
Michael Schurter 63f2418d29 Merge pull request #2683 from hashicorp/f-template-envparse
Move env file parsing to a library
2017-06-02 15:54:10 -07:00
Michael Schurter 73425f6d85 Update template docs to mention json encoding newlines 2017-06-02 15:08:08 -07:00
Michael Schurter a552bcdb55 Move env file parsing to a library 2017-06-02 15:03:27 -07:00
Alex Dadgar 3b46fe136f small cleanup 2017-05-31 15:56:54 -07:00
Alex Dadgar 8411bc8e01 Merge pull request #2651 from rawler/feature/2334
Implement support for docker-credential-helpers
2017-05-31 15:44:58 -07:00
Alex Dadgar 8d6e28ace8 Merge branch 'master' into feature/2334 2017-05-31 14:27:07 -07:00
Alex Dadgar 044f1da5ff Merge pull request #2681 from hashicorp/b-deadlock
Fix a deadlock relating to blocked allocations
2017-05-31 14:26:54 -07:00
Alex Dadgar ec9cb2c751 Merge pull request #2672 from eyberg/master
dont throw away errors in log rotation
2017-05-31 14:14:22 -07:00
Alex Dadgar b1eea2269a Fix deadlock 2017-05-31 14:05:47 -07:00
Michael Schurter cb568a5cf6 Cleanup lots of leaked alloc runners in tests 2017-05-31 11:39:50 -07:00
Ulrik Mikaelsson 6138564f00 Implement support for docker-credential-helpers
Solves: #2334
2017-05-31 12:45:02 +02:00