Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-docker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.10.1
Choose a base ref
...
head repository: puppetlabs/puppetlabs-docker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.10.2
Choose a head ref
  • 14 commits
  • 7 files changed
  • 8 contributors

Commits on May 28, 2020

  1. Merge pull request #619 from puppetlabs/release 

    Mergeback release version 3.10.1
    carabasdaniel authored May 28, 2020
    Configuration menu
    Copy the full SHA
    6fe049f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Allow all 3.x docker-compose minor versions 

    No major changes affecting this module compared to the previous max
compatibility with docker-compose 3.6; see
https://docs.docker.com/compose/compose-file/compose-versioning/#version-37

Fixes #575
    @runejuhl
    runejuhl committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    554aa09 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Merge pull request #620 from runejuhl/issue-575/allow-more-docker-com… 

    …pose-versions

Allow all 3.x docker-compose minor versions
    @daianamezdrea
    daianamezdrea authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    9c3d7a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Blocking ordering between non-Windows service stops 

    Windows based services stopping will block until the docker container stops (ie: if docker::run::stop_wait_time has been set to !=0)
service based stops do not - this adds that dependency in so that containers are not attempted to be removed until the service has stopped
    @AndrewLipscomb
    AndrewLipscomb authored Jun 11, 2020
    Configuration menu
    Copy the full SHA
    8dc7536 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Merge pull request #622 from ALTinners/ALTinners-patch-1 

    Blocking ordering between non-Windows service stops
    @adrianiurca
    adrianiurca authored Jun 18, 2020
    Configuration menu
    Copy the full SHA
    e6666cf View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Fixing the fix 'Fix the docker_compose options parameter position #378' 

    The fix done in 2018 was not complete. There were five more code lines which inserted the optional parameters at the wrong position.
    @awegmann
    awegmann authored Jul 8, 2020
    Configuration menu
    Copy the full SHA
    cf3955b View commit details
    Browse the repository at this point in the history

  2. Add root_dir in daemon.json

    @daianamezdrea
    daianamezdrea committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    25680ed View commit details
    Browse the repository at this point in the history

  3. Repair travis issue

    @daianamezdrea
    daianamezdrea committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    78ad963 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. Solve nginx error

    @daianamezdrea
    daianamezdrea committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    a4545ed View commit details
    Browse the repository at this point in the history

  2. repair ubuntu

    @daianamezdrea
    daianamezdrea committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    e31e52b View commit details
    Browse the repository at this point in the history

  3. Update docker_spec.rb

    @adrianiurca
    adrianiurca authored Jul 14, 2020
    Configuration menu
    Copy the full SHA
    2c48f10 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Merge pull request #632 from puppetlabs/root_dir 

    (MODULES-10691) - Add root_dir in daemon.json
    carabasdaniel authored Jul 15, 2020
    Configuration menu
    Copy the full SHA
    51e2886 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Merge pull request #631 from awegmann/master 

    Fixing the fix 'Fix the docker_compose options parameter position #378'
    @daianamezdrea
    daianamezdrea authored Jul 16, 2020
    Configuration menu
    Copy the full SHA
    5543d63 View commit details
    Browse the repository at this point in the history

  2. Release version 3.10.2

    Auto-release committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    c47981f View commit details
    Browse the repository at this point in the history
Loading