Skip to content

Conversation

@jldeen
Copy link
Contributor

@jldeen jldeen commented Sep 2, 2017

Best Practice Checklist

Check these items before submitting a PR... See the Contribution Guide for the full detail: https://github.com/Azure/azure-quickstart-templates/blob/master/1-CONTRIBUTION-GUIDE/README.md

  1. uri's compatible with all clouds (Stack, China, Government)
  2. Staged artifacts use _artifactsLocation & _artifactsLocationSasToken
  3. Use resourceGroup().location for resource locations
  4. Folder names for artifacts (nestedtemplates, scripts, DSC)
  5. Use literal values for apiVersion (no variables)
  6. Parameter files (GEN-UNIQUE for value generation and no "changemeplease" values
  7. $schema and other uris use https
  8. Use uniqueString() whenever possible to generate names for resources. While this is not required, it's one of the most common failure points in a deployment.
  9. Update the metadata.json with the current date

For details: https://github.com/Azure/azure-quickstart-templates/blob/master/1-CONTRIBUTION-GUIDE/bp-checklist.md

  • [X ] - Please check this box once you've submitted the PR if you've read through the Contribution Guide and best practices checklist.

Changelog

  • Updated the encrypted files on lines 945 and 1181 for the configure-swarmmode-cluster.sh
  • Specifically updated the Docker Daemon options to use dockerd as opposed to docker daemon: I.E.
    • ExecStart=
    • ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock

updated ExecStart command to reference /usr/bin/dockerd instead of docker daemon
Reverted to original deploy link (azure) (changed for testing only)
@msftclas
Copy link

msftclas commented Sep 2, 2017

@jldeen,
Thanks for your contribution as a Microsoft full-time employee or intern. You do not need to sign a CLA.
Thanks,
Microsoft Pull Request Bot

@jldeen jldeen changed the title Jldeen - Fix for Issue #3823 101-acsengine-swarmmod - Fix for Issue #3823 - Cannot connect to the Docker daemon Sep 2, 2017
@bmoore-msft bmoore-msft merged commit 544a60f into Azure:master Sep 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants