From 2e6a43df86470e659db6cbee9fb7b84a2084d7ed Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Tue, 22 Dec 2020 00:19:45 +0100
Subject: [PATCH] Added missing docker entries for a GA release

---
 .../Dockerfile                                |  1 +
 .../pom.xml                                   | 64 +++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
index d80d3a3e03..27c93ec94e 100644
--- a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
+++ b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
@@ -22,6 +22,7 @@ ENV PATH "${PATH}:${JAVA_HOME}/bin"
 # Spring Cloud Contract
 ENV SERVER_PORT 8750
 VOLUME /tmp
+COPY target/maven_dependencies /root/.m2/repository/
 ADD target/libs/stub-runner-boot.jar stub-runner-boot.jar
 RUN echo "Fetching dependencies, please wait..."
 RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar
diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
index 88b8a6f04d..152ca9129e 100644
--- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml
+++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -18,6 +18,51 @@
 	<description>Spring Cloud Contract Stub Runner Docker</description>
 
 	<dependencies>
+		<!-- Required, otherwise the docker image generation fails for GA -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-parent</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons-dependencies</artifactId>
+			<version>${spring-cloud-commons.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-dependencies</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-dependencies</artifactId>
+			<version>${spring-cloud-netflix.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-zookeeper-dependencies</artifactId>
+			<version>${spring-cloud-zookeeper.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-consul-dependencies</artifactId>
+			<version>${spring-cloud-consul.version}</version>
+			<type>pom</type>
+			<scope>runtime</scope>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
@@ -34,11 +79,30 @@
 					<failIfNoTests>false</failIfNoTests>
 				</configuration>
 			</plugin>
+			<!-- Required, otherwise the docker image generation fails for GA -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<version>3.1.2</version>
 				<executions>
+					<execution>
+						<id>copy-all-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/maven_dependencies
+							</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<useRepositoryLayout>true</useRepositoryLayout>
+							<copyPom>true</copyPom>
+							<excludeTransitive>false</excludeTransitive>
+						</configuration>
+					</execution>
 					<execution>
 						<id>copy-dependencies</id>
 						<phase>package</phase>