Make docker stack deploy a little bit more indempotent #30506

vdemeester · 2017-01-27T15:11:06Z

Version of #29732 for master.

Make sure running multiple times docker stack deploy --compose-file docker-compose.yml foo on the same unchanged file doesn't update the services each times. This is mainly due to the use of map .

This is related to #29676

This is sorting environment, extraHost and port too. ~~There is some weirdiness with ports but a PR might follow for that.~~ You can reproduce and validate this using the following compose file.

version: "3.0"

services:
  test:
    image: busybox
    command: top
    extra_hosts:
      - foo:1.1.1.1
      - bar:2.2.2.2
    environment:
      - FOO=BAR
      - FAR=BOO
    ports:
      - "5000:80"
      - "5001:81"
    networks: [front-tier, back-tier]

networks:
  front-tier:
  back-tier:

This also helps with Error response from daemon: rpc error: code = 2 desc = changing network in service is not supported when you didn't change the networks.

/cc @thaJeztah @dnephin @icecrime @cpuguy83 @aaronlehmann @aanand

If it gets in, I'll do a PR against master.

Signed-off-by: Vincent Demeester vincent@sbr.pm

Sort some slice fields before sending them to the swarm api so that it won't trigger an update. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

LK4D4

LGTM

LK4D4 · 2017-01-31T21:28:21Z

ping @docker/core-engine-maintainers

estesp · 2017-01-31T21:33:14Z

LGTM

adventureisyou · 2017-03-16T15:59:15Z

I'm seeing the same problem caused by secrets not being sorted. From nosing at the code, I don't think that was fixed in here, though it looks like secrets are handled slightly differently, so please let me know if I'm wrong. I'll happily open a separate ticket for secrets if that's the best way forward.

thaJeztah · 2017-03-16T16:12:34Z

@DrSolaris thanks for reporting; can you open a new issue for that for tracking? (you can include a link to this issue in the description)

…-indempotent Make docker stack deploy a little bit more indempotent

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746 Signed-off-by: Peter Nagy <xificurC@gmail.com>

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746 Signed-off-by: Peter Nagy <xificurC@gmail.com> (cherry picked from commit 27e8bdf32bbcc49ff3f8201b6da26aba567aa58e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746 Signed-off-by: Peter Nagy <xificurC@gmail.com> Upstream-commit: 27e8bdf32bbcc49ff3f8201b6da26aba567aa58e Component: cli

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746 Signed-off-by: Peter Nagy <xificurC@gmail.com> (cherry picked from commit 27e8bdf32bbcc49ff3f8201b6da26aba567aa58e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

`docker stack deploy` keeps restarting services it doesn't need to (no changes) because the entries' order gets randomized at some previous (de)serialization. Maybe it would be worth looking into this at a higher level and ensure all (de)serialization happens in an ordered collection. This quick fix sorts secrets and configs (in place, mutably) which ensures the same order for each run. Based on moby/moby#30506 Fixes moby/moby#34746 Signed-off-by: Peter Nagy <xificurC@gmail.com> (cherry picked from commit 27e8bdf) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Make docker stack deploy a little bit more indempotent

8b1c6bf

Sort some slice fields before sending them to the swarm api so that it won't trigger an update. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

GordonTheTurtle added the status/0-triage label Jan 27, 2017

vdemeester added status/2-code-review rebuild/windowsRS1 and removed status/0-triage labels Jan 27, 2017

GordonTheTurtle removed the rebuild/windowsRS1 label Jan 30, 2017

LK4D4 approved these changes Jan 31, 2017

View reviewed changes

estesp approved these changes Jan 31, 2017

View reviewed changes

estesp merged commit feb8b1c into moby:master Jan 31, 2017

GordonTheTurtle added this to the 1.14.0 milestone Jan 31, 2017

thaJeztah mentioned this pull request Jan 31, 2017

[1.13.x] Make docker stack deploy a little bit more idempotent #29732

Merged

thaJeztah modified the milestones: 1.13.1, 1.14.0 Jan 31, 2017

vdemeester deleted the 29732-follow-up-compose-indempotent branch January 31, 2017 21:52

thaJeztah added the process/cherry-picked label Feb 19, 2017

dnephin pushed a commit to dnephin/docker that referenced this pull request Apr 17, 2017

Merge pull request moby#30506 from vdemeester/29732-follow-up-compose…

7b5071b

…-indempotent Make docker stack deploy a little bit more indempotent

xificurC mentioned this pull request Sep 6, 2017

secrets break idempotence of docker stack deploy #34746

Closed

xificurC mentioned this pull request Sep 7, 2017

sort secrets and configs to ensure idempotence docker/cli#509

Merged

This was referenced Sep 19, 2017

[17.06] sort secrets and configs to ensure idempotence docker-archive/docker-ce#235

Closed

[17.09] sort secrets and configs to ensure idempotence docker-archive/docker-ce#236

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make docker stack deploy a little bit more indempotent #30506

Make docker stack deploy a little bit more indempotent #30506

vdemeester commented Jan 27, 2017

LK4D4 left a comment

LK4D4 commented Jan 31, 2017

estesp commented Jan 31, 2017

adventureisyou commented Mar 16, 2017

thaJeztah commented Mar 16, 2017

Make docker stack deploy a little bit more indempotent #30506

Make docker stack deploy a little bit more indempotent #30506

Conversation

vdemeester commented Jan 27, 2017

LK4D4 left a comment

Choose a reason for hiding this comment

LK4D4 commented Jan 31, 2017

estesp commented Jan 31, 2017

adventureisyou commented Mar 16, 2017

thaJeztah commented Mar 16, 2017