fixed java package, started seperating node modules to it's own layer

Author: waterfoul

.automation/build.py

@@ -283,6 +283,7 @@ def build_dockerfile(
     all_build_platform_dockerfile_items = []
     apk_packages = DEFAULT_DOCKERFILE_APK_PACKAGES.copy()
     apk_build_platform_packages = []
+    apk_npm_packages = []
     npm_packages = []
     pip_packages = []
     pipvenv_packages = {}
@@ -449,6 +450,8 @@ def build_dockerfile(
             apk_packages += item["install"]["apk"]
         if "build_platform_apk" in item["install"]:
             apk_build_platform_packages += item["install"]["build_platform_apk"]
+        if "npm_apk" in item["install"]:
+            apk_npm_packages += item["install"]["npm_apk"]
         # Collect npm packages
         if "npm" in item["install"]:
             npm_packages += item["install"]["npm"]
@@ -485,8 +488,15 @@ def build_dockerfile(
             "RUN apk add --update --no-cache \\\n                "
             + " \\\n                ".join(list(dict.fromkeys(apk_build_platform_packages)))
         )
+    apk_npm_install_command = ""
+    if len(apk_npm_packages) > 0:
+        apk_npm_install_command = (
+            "RUN apk add --update --no-cache \\\n                "
+            + " \\\n                ".join(list(dict.fromkeys(apk_npm_packages)))
+        )
     replace_in_file(dockerfile, "#APK__START", "#APK__END", apk_install_command)
     replace_in_file(dockerfile, "#BUILD_PLATFORM_APK__START", "#BUILD_PLATFORM_APK__END", apk_build_platform_install_command)
+    replace_in_file(dockerfile, "#NPM_APK__START", "#NPM_APK__END", apk_npm_install_command)
     # cargo packages
     cargo_install_command = ""
     # Pre-building packages

Dockerfile

@@ -84,7 +84,7 @@ FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS build-platform
 #BUILD_PLATFORM_APK__START
 RUN apk add --update --no-cache \
                 curl \
-                java
+                openjdk11
 #BUILD_PLATFORM_APK__END
 
 #BUILD_PLATFORM_OTHER__START
@@ -223,6 +223,90 @@ RUN echo \
 
 #PIPVENV__END
 
+FROM python:3.11.3-alpine3.17 AS node_modules
+
+#NPM_APK__START
+RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
+#NPM_APK__END
+
+############################
+# Install NPM dependencies #
+#############################################################################################
+## @generated by .automation/build.py using descriptor files, please do not update manually ##
+#############################################################################################
+
+ENV NODE_OPTIONS="--max-old-space-size=8192" \
+    NODE_ENV=production
+#NPM__START
+WORKDIR /node-deps
+RUN npm --no-cache install --ignore-scripts --omit=dev \
+                sfdx-cli \
+                typescript \
+                @coffeelint/cli \
+                jscpd \
+                stylelint \
+                stylelint-config-standard \
+                stylelint-config-sass-guidelines \
+                stylelint-scss \
+                gherkin-lint \
+                graphql \
+                graphql-schema-linter \
+                npm-groovy-lint \
+                htmlhint \
+                eslint \
+                eslint-config-airbnb \
+                eslint-config-prettier \
+                eslint-config-standard \
+                eslint-plugin-import \
+                eslint-plugin-jest \
+                eslint-plugin-node \
+                eslint-plugin-prettier \
+                eslint-plugin-promise \
+                eslint-plugin-vue \
+                @babel/core \
+                @babel/eslint-parser \
+                @microsoft/eslint-formatter-sarif \
+                standard \
+                prettier \
+                @prantlf/jsonlint \
+                eslint-plugin-jsonc \
+                v8r \
+                npm-package-json-lint \
+                npm-package-json-lint-config-default \
+                eslint-plugin-react \
+                eslint-plugin-jsx-a11y \
+                markdownlint-cli \
+                markdown-link-check \
+                markdown-table-formatter \
+                @stoplight/spectral-cli \
+                secretlint \
+                @secretlint/secretlint-rule-preset-recommend \
+                @secretlint/secretlint-formatter-sarif \
+                cspell \
+                sql-lint \
+                tekton-lint \
+                prettyjson \
+                @typescript-eslint/eslint-plugin \
+                @typescript-eslint/parser  && \
+    echo "Cleaning npm cache..." \
+    && npm cache clean --force || true \
+    && echo "Changing owner of node_modules files..." \
+    && chown -R "$(id -u)":"$(id -g)" node_modules # fix for https://github.com/npm/cli/issues/5900 \
+    && echo "Removing extra node_module files..." \
+    && rm -rf /root/.npm/_cacache \
+    && find . -name "*.d.ts" -delete \
+    && find . -name "*.map" -delete \
+    && find . -name "*.npmignore" -delete \
+    && find . -name "*.travis.yml" -delete \
+    && find . -name "CHANGELOG.md" -delete \
+    && find . -name "README.md" -delete \
+    && find . -name ".package-lock.json" -delete \
+    && find . -name "package-lock.json" -delete \
+    && find . -name "README.md" -delete
+WORKDIR /
+
+#NPM__END
+
 ##################
 # Get base image #
 ##################
@@ -353,84 +437,6 @@ COPY --link --from=python-venv /venvs /venvs
 ENV PATH="${PATH}":/venvs/ansible-lint/bin:/venvs/cpplint/bin:/venvs/cfn-lint/bin:/venvs/djlint/bin:/venvs/pylint/bin:/venvs/black/bin:/venvs/flake8/bin:/venvs/isort/bin:/venvs/bandit/bin:/venvs/mypy/bin:/venvs/pyright/bin:/venvs/ruff/bin:/venvs/checkov/bin:/venvs/semgrep/bin:/venvs/rst-lint/bin:/venvs/rstcheck/bin:/venvs/rstfmt/bin:/venvs/snakemake/bin:/venvs/snakefmt/bin:/venvs/proselint/bin:/venvs/sqlfluff/bin:/venvs/yamllint/bin
 #PIPVENV_PATH__END
 
-############################
-# Install NPM dependencies #
-#############################################################################################
-## @generated by .automation/build.py using descriptor files, please do not update manually ##
-#############################################################################################
-
-ENV NODE_OPTIONS="--max-old-space-size=8192" \
-    NODE_ENV=production
-#NPM__START
-WORKDIR /node-deps
-RUN npm --no-cache install --ignore-scripts --omit=dev \
-                sfdx-cli \
-                typescript \
-                @coffeelint/cli \
-                jscpd \
-                stylelint \
-                stylelint-config-standard \
-                stylelint-config-sass-guidelines \
-                stylelint-scss \
-                gherkin-lint \
-                graphql \
-                graphql-schema-linter \
-                npm-groovy-lint \
-                htmlhint \
-                eslint \
-                eslint-config-airbnb \
-                eslint-config-prettier \
-                eslint-config-standard \
-                eslint-plugin-import \
-                eslint-plugin-jest \
-                eslint-plugin-node \
-                eslint-plugin-prettier \
-                eslint-plugin-promise \
-                eslint-plugin-vue \
-                @babel/core \
-                @babel/eslint-parser \
-                @microsoft/eslint-formatter-sarif \
-                standard \
-                prettier \
-                @prantlf/jsonlint \
-                eslint-plugin-jsonc \
-                v8r \
-                npm-package-json-lint \
-                npm-package-json-lint-config-default \
-                eslint-plugin-react \
-                eslint-plugin-jsx-a11y \
-                markdownlint-cli \
-                markdown-link-check \
-                markdown-table-formatter \
-                @stoplight/spectral-cli \
-                secretlint \
-                @secretlint/secretlint-rule-preset-recommend \
-                @secretlint/secretlint-formatter-sarif \
-                cspell \
-                sql-lint \
-                tekton-lint \
-                prettyjson \
-                @typescript-eslint/eslint-plugin \
-                @typescript-eslint/parser  && \
-    echo "Cleaning npm cache..." \
-    && npm cache clean --force || true \
-    && echo "Changing owner of node_modules files..." \
-    && chown -R "$(id -u)":"$(id -g)" node_modules # fix for https://github.com/npm/cli/issues/5900 \
-    && echo "Removing extra node_module files..." \
-    && rm -rf /root/.npm/_cacache \
-    && find . -name "*.d.ts" -delete \
-    && find . -name "*.map" -delete \
-    && find . -name "*.npmignore" -delete \
-    && find . -name "*.travis.yml" -delete \
-    && find . -name "CHANGELOG.md" -delete \
-    && find . -name "README.md" -delete \
-    && find . -name ".package-lock.json" -delete \
-    && find . -name "package-lock.json" -delete \
-    && find . -name "README.md" -delete
-WORKDIR /
-
-#NPM__END
-
 # Add node packages to path #
 ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
     NODE_PATH="/node-deps/node_modules"

flavors/ci_light/Dockerfile

@@ -127,6 +127,53 @@ RUN echo \
 
 #PIPVENV__END
 
+FROM python:3.11.3-alpine3.17 AS node_modules
+
+#NODE_MODULES_APK__START
+RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
+#NODE_MODULES_APK__END
+
+############################
+# Install NPM dependencies #
+#############################################################################################
+## @generated by .automation/build.py using descriptor files, please do not update manually ##
+#############################################################################################
+
+ENV NODE_OPTIONS="--max-old-space-size=8192" \
+    NODE_ENV=production
+#NPM__START
+WORKDIR /node-deps
+RUN npm --no-cache install --ignore-scripts --omit=dev \
+                jscpd \
+                npm-groovy-lint \
+                @prantlf/jsonlint \
+                eslint \
+                eslint-plugin-jsonc \
+                @microsoft/eslint-formatter-sarif \
+                v8r \
+                prettier \
+                secretlint \
+                @secretlint/secretlint-rule-preset-recommend \
+                @secretlint/secretlint-formatter-sarif  && \
+    echo "Cleaning npm cache..." \
+    && npm cache clean --force || true \
+    && echo "Changing owner of node_modules files..." \
+    && chown -R "$(id -u)":"$(id -g)" node_modules # fix for https://github.com/npm/cli/issues/5900 \
+    && echo "Removing extra node_module files..." \
+    && rm -rf /root/.npm/_cacache \
+    && find . -name "*.d.ts" -delete \
+    && find . -name "*.map" -delete \
+    && find . -name "*.npmignore" -delete \
+    && find . -name "*.travis.yml" -delete \
+    && find . -name "CHANGELOG.md" -delete \
+    && find . -name "README.md" -delete \
+    && find . -name ".package-lock.json" -delete \
+    && find . -name "package-lock.json" -delete \
+    && find . -name "README.md" -delete
+WORKDIR /
+
+#NPM__END
+
 ##################
 # Get base image #
 ##################
@@ -212,47 +259,6 @@ COPY --link --from=python-venv /venvs /venvs
 ENV PATH="${PATH}":/venvs/yamllint/bin
 #PIPVENV_PATH__END
 
-############################
-# Install NPM dependencies #
-#############################################################################################
-## @generated by .automation/build.py using descriptor files, please do not update manually ##
-#############################################################################################
-
-ENV NODE_OPTIONS="--max-old-space-size=8192" \
-    NODE_ENV=production
-#NPM__START
-WORKDIR /node-deps
-RUN npm --no-cache install --ignore-scripts --omit=dev \
-                jscpd \
-                npm-groovy-lint \
-                @prantlf/jsonlint \
-                eslint \
-                eslint-plugin-jsonc \
-                @microsoft/eslint-formatter-sarif \
-                v8r \
-                prettier \
-                secretlint \
-                @secretlint/secretlint-rule-preset-recommend \
-                @secretlint/secretlint-formatter-sarif  && \
-    echo "Cleaning npm cache..." \
-    && npm cache clean --force || true \
-    && echo "Changing owner of node_modules files..." \
-    && chown -R "$(id -u)":"$(id -g)" node_modules # fix for https://github.com/npm/cli/issues/5900 \
-    && echo "Removing extra node_module files..." \
-    && rm -rf /root/.npm/_cacache \
-    && find . -name "*.d.ts" -delete \
-    && find . -name "*.map" -delete \
-    && find . -name "*.npmignore" -delete \
-    && find . -name "*.travis.yml" -delete \
-    && find . -name "CHANGELOG.md" -delete \
-    && find . -name "README.md" -delete \
-    && find . -name ".package-lock.json" -delete \
-    && find . -name "package-lock.json" -delete \
-    && find . -name "README.md" -delete
-WORKDIR /
-
-#NPM__END
-
 # Add node packages to path #
 ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
     NODE_PATH="/node-deps/node_modules"