Support arm64

super-linter · Feb 26, 2024 · b287234 · b287234
1 parent 52b082b
commit b287234
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 47 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -327,10 +327,10 @@ COPY --from=shfmt /bin/shfmt /usr/bin/
 ####################
 COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
 
-####################
-# Install scalafmt #
-####################
-COPY --from=scalafmt /bin/scalafmt /usr/bin/
+# ####################
+# # Install scalafmt #
+# ####################
+# COPY --from=scalafmt /bin/scalafmt /usr/bin/
 
 ######################
 # Install actionlint #
@@ -342,10 +342,10 @@ COPY --from=actionlint /usr/local/bin/actionlint /usr/bin/
 ######################
 COPY --from=kubeconfrm /kubeconform /usr/bin/
 
-#####################
-# Install clj-kondo #
-#####################
-COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
+# #####################
+# # Install clj-kondo #
+# #####################
+# COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
 
 ####################
 # Install dart-sdk #
@@ -464,20 +464,20 @@ COPY --from=dotnet-sdk /usr/share/dotnet /usr/share/dotnet
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet help
 
-#########################################
-# Install Powershell + PSScriptAnalyzer #
-#########################################
-COPY --from=powershell-installer /tmp/PS_INSTALL_FOLDER /tmp/PS_INSTALL_FOLDER
-COPY --from=powershell /opt/microsoft/powershell /opt/microsoft/powershell
-# Disable Powershell telemetry
-ENV POWERSHELL_TELEMETRY_OPTOUT=1
-ARG PSSA_VERSION='1.21.0'
-RUN PS_INSTALL_FOLDER="$(cat /tmp/PS_INSTALL_FOLDER)" \
-    && echo "PS_INSTALL_FOLDER: ${PS_INSTALL_FOLDER}" \
-    && ln -s "${PS_INSTALL_FOLDER}/pwsh" /usr/bin/pwsh \
-    && chmod a+x,o-w "${PS_INSTALL_FOLDER}/pwsh" \
-    && pwsh -c "Install-Module -Name PSScriptAnalyzer -RequiredVersion ${PSSA_VERSION} -Scope AllUsers -Force" \
-    && rm -rf /tmp/PS_INSTALL_FOLDER
+# #########################################
+# # Install Powershell + PSScriptAnalyzer #
+# #########################################
+# COPY --from=powershell-installer /tmp/PS_INSTALL_FOLDER /tmp/PS_INSTALL_FOLDER
+# COPY --from=powershell /opt/microsoft/powershell /opt/microsoft/powershell
+# # Disable Powershell telemetry
+# ENV POWERSHELL_TELEMETRY_OPTOUT=1
+# ARG PSSA_VERSION='1.21.0'
+# RUN PS_INSTALL_FOLDER="$(cat /tmp/PS_INSTALL_FOLDER)" \
+#     && echo "PS_INSTALL_FOLDER: ${PS_INSTALL_FOLDER}" \
+#     && ln -s "${PS_INSTALL_FOLDER}/pwsh" /usr/bin/pwsh \
+#     && chmod a+x,o-w "${PS_INSTALL_FOLDER}/pwsh" \
+#     && pwsh -c "Install-Module -Name PSScriptAnalyzer -RequiredVersion ${PSSA_VERSION} -Scope AllUsers -Force" \
+#     && rm -rf /tmp/PS_INSTALL_FOLDER
 
 #############################################################
 # Install Azure Resource Manager Template Toolkit (arm-ttk) #

diff --git a/dependencies/python/build-venvs.sh b/dependencies/python/build-venvs.sh
@@ -8,8 +8,10 @@
 #####################
 set -euo pipefail
 
+# libffi-dev is required for building wheel for cffi
 apk add --no-cache --virtual .python-build-deps \
   gcc \
+  libffi-dev \
   linux-headers \
   musl-dev \
   python3-dev
@@ -24,6 +26,14 @@ mkdir -p /venvs
 ########################################
 pip install virtualenv
 
+########################################################
+# Install Rust compiler (required by checkov on arm64) #
+########################################################
+# remove this once https://github.com/bridgecrewio/checkov/pull/6045 is merged
+apk add --no-cache curl
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+export PATH=$PATH:$HOME/.cargo/bin
+
 #######################################################
 # Iterate through requirments.txt to install binaries #
 #######################################################

diff --git a/scripts/install-glibc.sh b/scripts/install-glibc.sh
@@ -2,19 +2,6 @@
 
 set -euo pipefail
 
-case $TARGETARCH in
-amd64)
-  target=x86_64
-  ;;
-arm64)
-  target=arm64
-  ;;
-*)
-  echo "$TARGETARCH is not supported"
-  exit 1
-  ;;
-esac
-
 url=$(
   set -euo pipefail
   curl -s \
@@ -31,14 +18,9 @@ apk add --no-cache --force-overwrite "glibc-${GLIBC_VERSION}.apk"
 rm "glibc-${GLIBC_VERSION}.apk"
 
 # Install zlib
-mkdir /tmp/libz
-
 apk add --no-cache --virtual .glibc-build-deps \
   tar \
+  zlib \
   zstd
 
-curl --retry 5 --retry-delay 5 -sL https://www.archlinux.org/packages/core/${target}/zlib/download | tar -x --zstd -C /tmp/libz
-mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib
-rm -rf /tmp/libz
-
 apk del --no-network --purge .glibc-build-deps
diff --git a/scripts/linterVersions.sh b/scripts/linterVersions.sh
@@ -10,15 +10,15 @@ set -o pipefail
 declare -A LINTER_NAMES_ARRAY
 LINTER_NAMES_ARRAY['ANSIBLE']="ansible-lint"
 LINTER_NAMES_ARRAY['BASH']="shellcheck"
-LINTER_NAMES_ARRAY['BASH_EXEC']="bash-exec"
+# LINTER_NAMES_ARRAY['BASH_EXEC']="bash-exec"
 LINTER_NAMES_ARRAY['CHECKOV']="checkov"
 LINTER_NAMES_ARRAY['CLANG_FORMAT']="clang-format"
-LINTER_NAMES_ARRAY['CLOJURE']="clj-kondo"
+# LINTER_NAMES_ARRAY['CLOJURE']="clj-kondo"
 LINTER_NAMES_ARRAY['CLOUDFORMATION']="cfn-lint"
 LINTER_NAMES_ARRAY['COFFEESCRIPT']="coffeelint"
 LINTER_NAMES_ARRAY['CPP']="cpplint"
 LINTER_NAMES_ARRAY['CSS']="stylelint"
-LINTER_NAMES_ARRAY['DART']="dart"
+# LINTER_NAMES_ARRAY['DART']="dart"
 LINTER_NAMES_ARRAY['DOCKERFILE_HADOLINT']="hadolint"
 LINTER_NAMES_ARRAY['EDITORCONFIG']="editorconfig-checker"
 LINTER_NAMES_ARRAY['GITHUB_ACTIONS']="actionlint"
@@ -59,7 +59,7 @@ LINTER_NAMES_ARRAY['R']="R"
 LINTER_NAMES_ARRAY['RAKU']="raku"
 LINTER_NAMES_ARRAY['RENOVATE']="renovate-config-validator"
 LINTER_NAMES_ARRAY['RUBY']="rubocop"
-LINTER_NAMES_ARRAY['SCALAFMT']="scalafmt"
+# LINTER_NAMES_ARRAY['SCALAFMT']="scalafmt"
 LINTER_NAMES_ARRAY['SHELL_SHFMT']="shfmt"
 LINTER_NAMES_ARRAY['SNAKEMAKE_LINT']="snakemake"
 LINTER_NAMES_ARRAY['SNAKEMAKE_SNAKEFMT']="snakefmt"
@@ -81,8 +81,8 @@ LINTER_NAMES_ARRAY['YAML']="yamllint"
 if [[ "${IMAGE}" == "standard" ]]; then
   LINTER_NAMES_ARRAY['ARM']="arm-ttk"
   LINTER_NAMES_ARRAY['CSHARP']="dotnet"
-  LINTER_NAMES_ARRAY['ENV']="dotenv-linter"
-  LINTER_NAMES_ARRAY['POWERSHELL']="pwsh"
+  #   LINTER_NAMES_ARRAY['ENV']="dotenv-linter"
+  #   LINTER_NAMES_ARRAY['POWERSHELL']="pwsh"
   LINTER_NAMES_ARRAY['RUST_2015']="rustfmt"
   LINTER_NAMES_ARRAY['RUST_2018']="rustfmt"
   LINTER_NAMES_ARRAY['RUST_2021']="rustfmt"