From 5eff5b8b9764cf1b0d976034311072801b990f9c Mon Sep 17 00:00:00 2001
From: Sergio Zharinov <zharinov@users.noreply.github.com>
Date: Sat, 29 Feb 2020 14:57:52 +0400
Subject: [PATCH] fix(gradle): Use gradle wrapper inside docker (#5598)
---
lib/manager/gradle/__snapshots__/index.spec.ts.snap | 4 ++--
lib/manager/gradle/index.ts | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/manager/gradle/__snapshots__/index.spec.ts.snap b/lib/manager/gradle/__snapshots__/index.spec.ts.snap
index a4224fe6e6..36c79bff7f 100644
--- a/lib/manager/gradle/__snapshots__/index.spec.ts.snap
+++ b/lib/manager/gradle/__snapshots__/index.spec.ts.snap
@@ -508,7 +508,7 @@ Array [
exports[`manager/gradle extractPackageFile should use docker even if gradlew is available 1`] = `
Array [
Object {
- "cmd": "docker run --rm -v \\"localDir\\":\\"localDir\\" -w \\"localDir\\" renovate/gradle bash -l -c \\"gradle --init-script renovate-plugin.gradle renovate\\"",
+ "cmd": "docker run --rm -v \\"localDir\\":\\"localDir\\" -w \\"localDir\\" renovate/gradle bash -l -c \\"./gradlew --init-script renovate-plugin.gradle renovate\\"",
"options": Object {
"cwd": "localDir",
"encoding": "utf-8",
@@ -536,7 +536,7 @@ Array [
},
},
Object {
- "cmd": "docker run --rm -v \\"localDir\\":\\"localDir\\" -w \\"localDir\\" renovate/gradle bash -l -c \\"gradle --init-script renovate-plugin.gradle renovate\\"",
+ "cmd": "docker run --rm -v \\"localDir\\":\\"localDir\\" -w \\"localDir\\" renovate/gradle bash -l -c \\"./gradlew --init-script renovate-plugin.gradle renovate\\"",
"options": Object {
"cwd": "localDir",
"encoding": "utf-8",
diff --git a/lib/manager/gradle/index.ts b/lib/manager/gradle/index.ts
index 058984edbe..4a4cff5f8b 100644
--- a/lib/manager/gradle/index.ts
+++ b/lib/manager/gradle/index.ts
@@ -24,7 +24,6 @@ import {
import { platform } from '../../platform';
import { LANGUAGE_JAVA } from '../../constants/languages';
import { DATASOURCE_MAVEN } from '../../constants/data-binary-source';
-import { BinarySource } from '../../util/exec/common';
import { DatasourceError } from '../../datasource';
export const GRADLE_DEPENDENCY_REPORT_OPTIONS =
@@ -46,8 +45,6 @@ async function getGradleCommandLine(
): Promise<string> {
const args = GRADLE_DEPENDENCY_REPORT_OPTIONS;
- if (config.binarySource === BinarySource.Docker) return `gradle ${args}`;
-
const gradlewPath = upath.join(cwd, 'gradlew');
const gradlewExists = await exists(gradlewPath);
const gradlewExecutable = gradlewExists && (await canExecute(gradlewPath));
--
GitLab