Remove openssl reinstall, as base image has updated version from alpi…

…ne 3.18.5 (#3181) * Remove openssl from default packages since alpine 3.18.5 release * [MegaLinter] Apply linters fixes * Build * Downgrade stylelint * typo * [MegaLinter] Apply linters fixes * [MegaLinter] Apply linters fixes * Downgrade stylelint-config-standard --------- Co-authored-by: echoix <echoix@users.noreply.github.com> Co-authored-by: nvuillam <nicolas.vuillamy@cloudity.com> Co-authored-by: nvuillam <nvuillam@users.noreply.github.com>
oxsecurity · Dec 9, 2023 · 84e465b · 84e465b
1 parent 913d5d2
commit 84e465b
Show file tree

Hide file tree

Showing 140 changed files with 1 addition and 141 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -88,7 +88,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 docker \
                 openrc \
                 icu-libs \
@@ -117,6 +116,7 @@ RUN apk add --no-cache \
                 gcompat \
                 libc6-compat \
                 libstdc++ \
+                openssl \
                 readline-dev \
                 g++ \
                 libc-dev \

diff --git a/flavors/c_cpp/Dockerfile b/flavors/c_cpp/Dockerfile
@@ -64,7 +64,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 clang16-extra-tools \

diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile
@@ -54,7 +54,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 nodejs \
                 npm \
                 yarn \

diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile
@@ -75,7 +75,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 docker \
                 openrc \
                 openjdk17 \

diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile
@@ -64,7 +64,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile
@@ -70,7 +70,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 icu-libs \
                 dotnet7-sdk \
                 openjdk17 \

diff --git a/flavors/dotnetweb/Dockerfile b/flavors/dotnetweb/Dockerfile
@@ -70,7 +70,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 icu-libs \
                 dotnet7-sdk \
                 openjdk17 \

diff --git a/flavors/formatters/Dockerfile b/flavors/formatters/Dockerfile
@@ -50,7 +50,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 dotnet7-sdk \
                 icu-libs \
                 npm \

diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile
@@ -70,7 +70,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile
@@ -64,7 +64,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile
@@ -63,7 +63,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile
@@ -64,7 +64,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 gnupg \
                 php81 \

diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile
@@ -64,7 +64,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile
@@ -63,7 +63,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile
@@ -63,7 +63,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile
@@ -63,7 +63,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/flavors/security/Dockerfile b/flavors/security/Dockerfile
@@ -60,7 +60,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 helm \
                 gcompat \
                 libc6-compat \

diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile
@@ -63,7 +63,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 docker \
                 openrc \
                 openjdk17 \

diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile
@@ -69,7 +69,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 py3-pyflakes \
                 nodejs \

diff --git a/linters/action_actionlint/Dockerfile b/linters/action_actionlint/Dockerfile
@@ -51,7 +51,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 py3-pyflakes \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/ansible_ansible_lint/Dockerfile b/linters/ansible_ansible_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/arm_arm_ttk/Dockerfile b/linters/arm_arm_ttk/Dockerfile
@@ -50,7 +50,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 icu-libs \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/bash_exec/Dockerfile b/linters/bash_exec/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/bash_shellcheck/Dockerfile b/linters/bash_shellcheck/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/bash_shfmt/Dockerfile b/linters/bash_shfmt/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/bicep_bicep_linter/Dockerfile b/linters/bicep_bicep_linter/Dockerfile
@@ -50,7 +50,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 icu-libs \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/c_clang_format/Dockerfile b/linters/c_clang_format/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 clang16-extra-tools \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/c_cpplint/Dockerfile b/linters/c_cpplint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/clojure_clj_kondo/Dockerfile b/linters/clojure_clj_kondo/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/clojure_cljstyle/Dockerfile b/linters/clojure_cljstyle/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/cloudformation_cfn_lint/Dockerfile b/linters/cloudformation_cfn_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/coffee_coffeelint/Dockerfile b/linters/coffee_coffeelint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 npm \
                 nodejs-current \
                 yarn \

diff --git a/linters/copypaste_jscpd/Dockerfile b/linters/copypaste_jscpd/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 nodejs \
                 npm \
                 yarn \

diff --git a/linters/cpp_clang_format/Dockerfile b/linters/cpp_clang_format/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 clang16-extra-tools \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/cpp_cpplint/Dockerfile b/linters/cpp_cpplint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/csharp_csharpier/Dockerfile b/linters/csharp_csharpier/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 dotnet7-sdk \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/csharp_dotnet_format/Dockerfile b/linters/csharp_dotnet_format/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 dotnet7-sdk \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/csharp_roslynator/Dockerfile b/linters/csharp_roslynator/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 dotnet7-sdk \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/css_scss_lint/Dockerfile b/linters/css_scss_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 ruby \
                 ruby-dev \
                 ruby-bundler \

diff --git a/linters/css_stylelint/Dockerfile b/linters/css_stylelint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 npm \
                 nodejs-current \
                 yarn \

diff --git a/linters/dart_dartanalyzer/Dockerfile b/linters/dart_dartanalyzer/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/dockerfile_hadolint/Dockerfile b/linters/dockerfile_hadolint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/editorconfig_editorconfig_checker/Dockerfile b/linters/editorconfig_editorconfig_checker/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/env_dotenv_linter/Dockerfile b/linters/env_dotenv_linter/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/gherkin_gherkin_lint/Dockerfile b/linters/gherkin_gherkin_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 npm \
                 nodejs-current \
                 yarn \

diff --git a/linters/go_golangci_lint/Dockerfile b/linters/go_golangci_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 go \
     && git config --global core.autocrlf true
 #APK__END

diff --git a/linters/go_revive/Dockerfile b/linters/go_revive/Dockerfile
@@ -53,7 +53,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
     && git config --global core.autocrlf true
 #APK__END
 

diff --git a/linters/graphql_graphql_schema_linter/Dockerfile b/linters/graphql_graphql_schema_linter/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 npm \
                 nodejs-current \
                 yarn \

diff --git a/linters/groovy_npm_groovy_lint/Dockerfile b/linters/groovy_npm_groovy_lint/Dockerfile
@@ -48,7 +48,6 @@ RUN apk add --no-cache \
                 make \
                 musl-dev \
                 openssh \
-                openssl \
                 openjdk17 \
                 npm \
                 nodejs-current \