From 324067a893863d52d145c7d5bfba1013b427da43 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:29:11 -0700 Subject: [PATCH 1/2] Remove trailing space from build script --- .automation/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.automation/build.py b/.automation/build.py index b0260e0bc43..6cb73c1fecb 100644 --- a/.automation/build.py +++ b/.automation/build.py @@ -438,7 +438,7 @@ def build_dockerfile( + ' && find . -name "README.md" -delete \\\n' + ' && find . -name ".package-lock.json" -delete \\\n' + ' && find . -name "package-lock.json" -delete \\\n' - + ' && find . -name "README.md" -delete \n' + + ' && find . -name "README.md" -delete\n' + "WORKDIR /\n" ) replace_in_file(dockerfile, "#NPM__START", "#NPM__END", npm_install_command) From c381472b238aac796938b8af7542e4bad62d6e63 Mon Sep 17 00:00:00 2001 From: Parker Brown <17183625+parkerbxyz@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:31:24 -0700 Subject: [PATCH 2/2] Remove trailing spaces from Dockerfiles --- Dockerfile | 2 +- flavors/ci_light/Dockerfile | 2 +- flavors/documentation/Dockerfile | 2 +- flavors/dotnet/Dockerfile | 2 +- flavors/go/Dockerfile | 2 +- flavors/java/Dockerfile | 2 +- flavors/javascript/Dockerfile | 2 +- flavors/php/Dockerfile | 2 +- flavors/python/Dockerfile | 2 +- flavors/ruby/Dockerfile | 2 +- flavors/rust/Dockerfile | 2 +- flavors/salesforce/Dockerfile | 2 +- flavors/security/Dockerfile | 2 +- flavors/swift/Dockerfile | 2 +- flavors/terraform/Dockerfile | 2 +- linters/groovy_npm_groovy_lint/Dockerfile | 2 +- linters/javascript_es/Dockerfile | 2 +- linters/json_eslint_plugin_jsonc/Dockerfile | 2 +- linters/jsx_eslint/Dockerfile | 2 +- linters/repository_secretlint/Dockerfile | 2 +- linters/tsx_eslint/Dockerfile | 2 +- linters/typescript_es/Dockerfile | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e603408bc9..740215760d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -237,7 +237,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile index 0d94d868e75..2c4a1d5a545 100644 --- a/flavors/ci_light/Dockerfile +++ b/flavors/ci_light/Dockerfile @@ -124,7 +124,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile index f1dd65e1403..a6f269c3677 100644 --- a/flavors/documentation/Dockerfile +++ b/flavors/documentation/Dockerfile @@ -147,7 +147,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile index af01bfb76d1..aaa6e40ee75 100644 --- a/flavors/dotnet/Dockerfile +++ b/flavors/dotnet/Dockerfile @@ -165,7 +165,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index ade244bec6e..2b7092c93e0 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -147,7 +147,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile index 44ab121dff9..8976d5c8a3e 100644 --- a/flavors/java/Dockerfile +++ b/flavors/java/Dockerfile @@ -148,7 +148,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile index a1027848714..dd3d6cd1bc6 100644 --- a/flavors/javascript/Dockerfile +++ b/flavors/javascript/Dockerfile @@ -167,7 +167,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile index 4fcaf07d3d3..2d5f909628e 100644 --- a/flavors/php/Dockerfile +++ b/flavors/php/Dockerfile @@ -169,7 +169,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index 5bcacba9a17..fe1b65b6dbf 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -156,7 +156,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile index 944756b0c59..88d854af94c 100644 --- a/flavors/ruby/Dockerfile +++ b/flavors/ruby/Dockerfile @@ -147,7 +147,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile index 380c0a61d39..c8f531b66c5 100644 --- a/flavors/rust/Dockerfile +++ b/flavors/rust/Dockerfile @@ -147,7 +147,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile index 8d04a8e3cd9..638d0803db3 100644 --- a/flavors/salesforce/Dockerfile +++ b/flavors/salesforce/Dockerfile @@ -148,7 +148,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/security/Dockerfile b/flavors/security/Dockerfile index 8881bf31db6..3ee41f0ace9 100644 --- a/flavors/security/Dockerfile +++ b/flavors/security/Dockerfile @@ -120,7 +120,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile index 253a82f4639..77baaf58130 100644 --- a/flavors/swift/Dockerfile +++ b/flavors/swift/Dockerfile @@ -149,7 +149,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile index d805db1cb90..82747bcaa0f 100644 --- a/flavors/terraform/Dockerfile +++ b/flavors/terraform/Dockerfile @@ -151,7 +151,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/groovy_npm_groovy_lint/Dockerfile b/linters/groovy_npm_groovy_lint/Dockerfile index 60f8d5b8780..fb540a73a0b 100644 --- a/linters/groovy_npm_groovy_lint/Dockerfile +++ b/linters/groovy_npm_groovy_lint/Dockerfile @@ -98,7 +98,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/javascript_es/Dockerfile b/linters/javascript_es/Dockerfile index aae6b2d582b..3307dc37f55 100644 --- a/linters/javascript_es/Dockerfile +++ b/linters/javascript_es/Dockerfile @@ -110,7 +110,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/json_eslint_plugin_jsonc/Dockerfile b/linters/json_eslint_plugin_jsonc/Dockerfile index fef57b22257..3c5fd3f2608 100644 --- a/linters/json_eslint_plugin_jsonc/Dockerfile +++ b/linters/json_eslint_plugin_jsonc/Dockerfile @@ -99,7 +99,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/jsx_eslint/Dockerfile b/linters/jsx_eslint/Dockerfile index ce74b1e3d1d..05c8842e8f0 100644 --- a/linters/jsx_eslint/Dockerfile +++ b/linters/jsx_eslint/Dockerfile @@ -100,7 +100,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/repository_secretlint/Dockerfile b/linters/repository_secretlint/Dockerfile index 60b282b3e6d..ce038008ff6 100644 --- a/linters/repository_secretlint/Dockerfile +++ b/linters/repository_secretlint/Dockerfile @@ -99,7 +99,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/tsx_eslint/Dockerfile b/linters/tsx_eslint/Dockerfile index 6b20c58037f..c302de28668 100644 --- a/linters/tsx_eslint/Dockerfile +++ b/linters/tsx_eslint/Dockerfile @@ -109,7 +109,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END diff --git a/linters/typescript_es/Dockerfile b/linters/typescript_es/Dockerfile index a34df7e490d..3f62ae8b09c 100644 --- a/linters/typescript_es/Dockerfile +++ b/linters/typescript_es/Dockerfile @@ -112,7 +112,7 @@ RUN npm --no-cache install --ignore-scripts \ && find . -name "README.md" -delete \ && find . -name ".package-lock.json" -delete \ && find . -name "package-lock.json" -delete \ - && find . -name "README.md" -delete + && find . -name "README.md" -delete WORKDIR / #NPM__END