From abc9f09efb381dd79025bb5f85d5c707c66a7add Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Wed, 16 Nov 2022 00:33:15 -0800
Subject: [PATCH] Fix publishing servlet images (#7194)

Resolves #7185
---
 .github/dependabot.yml | 8 ++++++++
 settings.gradle.kts    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0d72fa1bdf..4b85e5eaa7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -94,6 +94,14 @@ updates:
     # need to scope gradle dependency updates down in this repo because most of the instrumentations
     # intentionally test against old library versions
     directory: "/.github/dependabot-symlinks"
+    ignore:
+      - dependency-name: "com.bmuschko.docker-remote-api"
+        # Publishing Servlet images for smoke tests is failing starting from 9.0.0
+        # (see https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7185)
+        # in particular, these commands are failing (reproducible locally):
+        # ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PsmokeTestServer=jetty
+        # ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PsmokeTestServer=jetty
+        versions: [ "[9,)" ]
     rebase-strategy: "disabled"
     schedule:
       interval: "daily"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fa249a15c2..78f6a886b7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
   plugins {
-    id("com.bmuschko.docker-remote-api") version "9.0.0"
+    id("com.bmuschko.docker-remote-api") version "8.1.0"
     id("com.github.ben-manes.versions") version "0.44.0"
     id("com.github.jk1.dependency-license-report") version "2.1"
     id("com.google.cloud.tools.jib") version "3.3.1"