Group dependabot docker directories (#5698)

.github/dependabot.yml

@@ -36,11 +36,11 @@ updates:
       - "update"
 
   # Enable version updates for Docker
-  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't
-  # support wildcards or recursively checking subdirectories. Check this issue for updates:
-  # https://github.com/dependabot/dependabot-core/issues/2178
   - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/local/django/"
+    directories:
+      - "{{cookiecutter.project_slug}}/compose/local/django/"
+      - "{{cookiecutter.project_slug}}/compose/local/docs/"
+      - "{{cookiecutter.project_slug}}/compose/production/django/"
     schedule:
       interval: "daily"
     ignore:
@@ -52,60 +52,12 @@ updates:
       - "update"
 
   - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/local/docs/"
+    directories:
-    schedule:
+      - "{{cookiecutter.project_slug}}/compose/local/node/"
-      interval: "daily"
+      - "{{cookiecutter.project_slug}}/compose/production/aws/"
-    ignore:
+      - "{{cookiecutter.project_slug}}/compose/production/postgres/"
-      - dependency-name: "*"
+      - "{{cookiecutter.project_slug}}/compose/production/nginx/"
-        update-types:
+      - "{{cookiecutter.project_slug}}/compose/production/traefik/"
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/local/node/"
-    schedule:
-      interval: "daily"
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/production/aws/"
-    schedule:
-      interval: "daily"
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/production/django/"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/production/postgres/"
-    schedule:
-      interval: "daily"
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/production/nginx/"
-    schedule:
-      interval: "daily"
-    versioning-strategy: increase
-    labels:
-      - "update"
-
-  - package-ecosystem: "docker"
-    directory: "{{cookiecutter.project_slug}}/compose/production/traefik/"
     schedule:
       interval: "daily"
     labels:

{{cookiecutter.project_slug}}/.github/dependabot.yml

@@ -13,12 +13,12 @@ updates:
 {%- if cookiecutter.use_docker == 'y' %}
 
   # Enable version updates for Docker
-  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't
-  # support wildcards or recursively checking subdirectories. Check this issue for updates:
-  # https://github.com/dependabot/dependabot-core/issues/2178
   - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/local/django` directory
-    directory: 'compose/local/django/'
+    directories:
+      - 'compose/local/django/'
+      - 'compose/local/docs/'
+      - 'compose/production/django/'
     # Every weekday
     schedule:
       interval: 'daily'
@@ -29,69 +29,20 @@ updates:
           - 'version-update:semver-major'
           - 'version-update:semver-minor'
 
-  - package-ecosystem: 'docker'
-    # Look for a `Dockerfile` in the `compose/local/docs` directory
-    directory: 'compose/local/docs/'
-    # Every weekday
-    schedule:
-      interval: 'daily'
-    # Ignore minor version updates (3.10 -> 3.11) but update patch versions
-    ignore:
-      - dependency-name: '*'
-        update-types:
-          - 'version-update:semver-major'
-          - 'version-update:semver-minor'
 
   - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/local/node` directory
-    directory: 'compose/local/node/'
+    directories:
-    # Every weekday
+      - 'compose/local/node/'
-    schedule:
+      - 'compose/production/aws/'
-      interval: 'daily'
+      - 'compose/production/postgres/'
-
+      - 'compose/production/traefik/'
-  - package-ecosystem: 'docker'
-    # Look for a `Dockerfile` in the `compose/production/aws` directory
-    directory: 'compose/production/aws/'
-    # Every weekday
-    schedule:
-      interval: 'daily'
-
-  - package-ecosystem: 'docker'
-    # Look for a `Dockerfile` in the `compose/production/django` directory
-    directory: 'compose/production/django/'
-    # Every weekday
-    schedule:
-      interval: 'daily'
-    # Ignore minor version updates (3.10 -> 3.11) but update patch versions
-    ignore:
-      - dependency-name: '*'
-        update-types:
-          - 'version-update:semver-major'
-          - 'version-update:semver-minor'
-
-  - package-ecosystem: 'docker'
-    # Look for a `Dockerfile` in the `compose/production/postgres` directory
-    directory: 'compose/production/postgres/'
-    # Every weekday
-    schedule:
-      interval: 'daily'
-
-  - package-ecosystem: 'docker'
-    # Look for a `Dockerfile` in the `compose/production/traefik` directory
-    directory: 'compose/production/traefik/'
-    # Every weekday
-    schedule:
-      interval: 'daily'
-
 {%- if cookiecutter.cloud_provider == 'None' %}
-
+      - 'compose/production/nginx/'
-  - package-ecosystem: 'docker'
+{%- endif %}
-    # Look for a `Dockerfile` in the `compose/production/nginx` directory
-    directory: 'compose/production/nginx/'
     # Every weekday
     schedule:
       interval: 'daily'
-{%- endif %}
 
 {%- endif %}