Restructure Docker image from scratch

.dockleignore

@@ -0,0 +1,6 @@
+# [Enable Content trust for Docker] - We don't really need this much because only we both publish and pull
+# this image and pin the version so we can't accidentally pull unknown malicious image.
+CIS-DI-0005
+
+# [Add HEALTHCHECK instruction to the container image] - Does not make sense for our CI image.
+CIS-DI-0006

.github/workflows/pull_request.yml

@@ -21,6 +21,7 @@ jobs:
         uses: ./.github/actions/login
         with:
           user-name: ${{ vars.DOCKER_HUB_TEST_USERNAME }}
+          # Test public repos read only token on a separate androidackee test account.
           token: ${{ vars.DOCKER_HUB_TEST_TOKEN }}
 
       - name: Preflight checks

CHANGELOG.MD

@@ -1,9 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.0.0] - 2026-02-17
+### Changed
+- Complete rewrite of Dockerfile using multi-stage build architecture (separate stages for Java, Android SDK, Danger, Git LFS)
+- Danger JS installation now runs as `nonroot` user to reduce attack surface
+- Node.js installed from system apt packages instead of via nvm
+- Updated Android cmdline-tools to 14742923, platform to 36, build-tools to 36.1.0
+
+### Added
+- Checksum verification for all downloaded artifacts (Java, Kotlin compiler, danger-kotlin)
+- Integration of shai-hulud supply chain attack detector for npm packages
+- npm scripts disabled globally to prevent supply chain attacks
+- Final image runs as `nonroot` user
+
+### Removed
+- Flutter support
+- nvm and Node.js version management
+- Google Cloud CLI
+- Privilege escalation binaries from final image (`su`, `apt`, `apt-get`, `apt-cache`, `dpkg`, `unix_chkpwd`)
+
 ## [v2.8.0] - 2025-12-04
 ### Changed
 - Update danger kotlin to 1.3.4

Dockerfile

@@ -1,128 +1,238 @@
-FROM debian:trixie
+# === Global args ===
 
-LABEL tag="ackee-gitlab" \
-      author="Ackee 🦄" \
-      description="This Docker image serves as an environment for running Android builds on Gitlab CI in Ackee workspace"
+# == Versions ==
+
+ARG ANDROID_CMDLINE_TOOLS_VERSION="14742923"
+ARG ANDROID_BUILD_TOOLS_VERSION="36.1.0"
+ARG ANDROID_PLATFORM_VERSION="36"
+
+ARG DANGER_JS_VERSION="12.3.4"
+ARG DANGER_KOTLIN_VERSION="1.3.4"
+ARG DANGER_KOTLIN_CHECKSUM="sha256:232b11680cdfe50c64a6cef1d96d3cd09a857422da1e2dd0464f80c8ddb1afac"
+
+# If you need to update major Java version, you will need to adjust the version in the download link as well
+ARG JAVA_VERSION="17.0.18_8"
+ARG JAVA_CHECKSUM="sha256:0c94cbb54325c40dcf026143eb621562017db5525727f2d9131a11250f72c450"
+
+# Needed for danger-kotlin
+ARG KOTLINC_VERSION="2.2.21"
+ARG KOTLINC_CHECKSUM="sha256:a623871f1cd9c938946948b70ef9170879f0758043885bbd30c32f024e511714"
+
+# == Others ==
+
+ARG CMDLINE_TOOLS_DIR="cmdline-tools"
+ARG CMDLINE_TOOLS_VERSION_DIR="latest"
+
+ARG DANGER_BASE_PATH="/usr/local"
+ARG KOTLINC_BASE_PATH="/usr/lib"
+
+
+
+# === Stages ===
+
+# == base ==
+
+# Base stage that all stages inherit from. It contains common setup needed for both build and final stages.
+FROM dhi.io/debian-base:trixie-debian13-dev AS base
+
+ARG CMDLINE_TOOLS_DIR
+ARG CMDLINE_TOOLS_VERSION_DIR
+ARG JAVA_VERSION
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt update && apt install -y \
-    curl \
-    git \
-    libgl1 \
-    unzip \
-    zip \
-    python3 \
-    wget \
-    xz-utils \
-    fontconfig \
-    gnupg
-
-RUN curl -s "https://get.sdkman.io" | bash && \
-    source "$HOME/.sdkman/bin/sdkman-init.sh" && \
-    sdk install java 17.0.7-oracle && \
-    sdk use java 17.0.7-oracle
-
-ENV JAVA_HOME=/root/.sdkman/candidates/java/current
-ENV ANDROID_HOME=/opt/android-sdk-linux
+ENV ANDROID_HOME="/opt/android-sdk-linux"
+ENV PATH="$PATH:$ANDROID_HOME/$CMDLINE_TOOLS_DIR/$CMDLINE_TOOLS_VERSION_DIR"
+ENV PATH="$PATH:$ANDROID_HOME/$CMDLINE_TOOLS_DIR/$CMDLINE_TOOLS_VERSION_DIR/bin"
+ENV PATH="$PATH:$ANDROID_HOME/platform-tools"
+
+ENV JAVA_HOME="/usr/lib/jdk/$JAVA_VERSION"
 ENV PATH="$PATH:$JAVA_HOME/bin"
 
-# Download Android SDK command line tools into $ANDROID_HOME
-RUN cd /opt && wget -q  https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O android-sdk-tools.zip && \
-    unzip -q android-sdk-tools.zip && mkdir -p "$ANDROID_HOME/cmdline-tools/" && mv cmdline-tools latest && mv latest/ "$ANDROID_HOME"/cmdline-tools/ && \
-    rm android-sdk-tools.zip
+RUN apt update && apt install -y --no-install-recommends \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+
+
+# == build ==
+
+# Base stage for all build stages. These stages are used for building dependencies that are then
+# copied to the final image.
+FROM base AS build
+
+RUN apt update && apt install -y --no-install-recommends \
+    curl \
+    # Needed for danger-js installation
+    npm \
+    unzip
+
+# Disables npm preinstall, postintall and other scripts that might run when any npm package is installed,
+# which is usually exploited by supply chain attacks like shai-hulud
+RUN npm config set ignore-scripts true
+
+
+
+# == java-installation ==
+
+FROM build AS java-installation
+
+ARG JAVA_CHECKSUM
+ARG JAVA_VERSION
+
+ARG JAVA_TEMP_DIR="java"
+# Replace _ with + in version for download link
+ENV JAVA_VERSION_PLUS="${JAVA_VERSION/_/+}"
+ADD --checksum="$JAVA_CHECKSUM" --unpack=true \
+    "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-$JAVA_VERSION_PLUS/OpenJDK17U-jdk_x64_linux_hotspot_$JAVA_VERSION.tar.gz" \
+    "$JAVA_TEMP_DIR"
+RUN mkdir -p "$JAVA_HOME" && \
+    # Temp dir contains unpacked JDK folder, we want to move its contents to JAVA_HOME
+    mv "$JAVA_TEMP_DIR"/*/* "$JAVA_HOME"
+
+
+
+# == android-sdk-installation ==
+
+# Installs Android SDK. Requires Java to be already installed.
+FROM java-installation AS android-sdk-installation
+
+ARG ANDROID_BUILD_TOOLS_VERSION
+ARG ANDROID_CMDLINE_TOOLS_VERSION
+ARG ANDROID_PLATFORM_VERSION
+ARG CMDLINE_TOOLS_DIR
+ARG CMDLINE_TOOLS_VERSION_DIR
 
-ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools"
+WORKDIR /opt
+
+ARG CMDLINE_TOOLS_ZIP="cmdline-tools.zip"
+ADD "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_CMDLINE_TOOLS_VERSION}_latest.zip" \
+    "./$CMDLINE_TOOLS_ZIP"
+
+ARG CMDLINE_TOOLS_PATH="$ANDROID_HOME/$CMDLINE_TOOLS_DIR"
+RUN mkdir -p "$CMDLINE_TOOLS_PATH" && \
+    unzip -q "$CMDLINE_TOOLS_ZIP" -d "$CMDLINE_TOOLS_PATH" && \
+    mv "$CMDLINE_TOOLS_PATH/$CMDLINE_TOOLS_DIR" "$CMDLINE_TOOLS_PATH/$CMDLINE_TOOLS_VERSION_DIR"
 
 # Accept licenses before installing components
 # License is valid for all the standard components in versions installed from this file
 # Non-standard components: MIPS system images, preview versions, GDK (Google Glass) and Android Google TV require separate licenses, not accepted there
 RUN yes | sdkmanager --licenses
 
-RUN sdkmanager "platform-tools"
-
-# list all platforms, sort them in descending order, take the newest 8 versions and install them
-RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep platforms | awk -F' ' '{print $1}' | sort -nr -k2 -t- | head -8)
-# list all build-tools, sort them in descending order and install them
-RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep build-tools | awk -F' ' '{print $1}' | sort -nr -k2 -t \; | uniq)
-
-# setup gcloud
-RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk main" >> /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor >> /etc/apt/trusted.gpg.d/cloud.google.gpg && \
-    apt update && apt install -y google-cloud-cli && \
-    gcloud config set component_manager/disable_update_check true
-
-# nvm environment variables
-ENV NVM_DIR=/usr/local/nvm \
-    NODE_VERSION=23.5.0
-
-# install nvm
-# https://github.com/creationix/nvm#install-script
-RUN mkdir $NVM_DIR && \
-    curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.39.7/install.sh | bash
-
-RUN source $NVM_DIR/nvm.sh && \
-    nvm install $NODE_VERSION && \
-    nvm alias default $NODE_VERSION && \
-    nvm use default
-
-# add node and npm to path so the commands are available
-ENV NODE_PATH=$NVM_DIR/v$NODE_VERSION/lib/node_modules \
-    PATH=$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
-
-# install make which is needed in danger-kotlin install phase
-RUN apt update && apt install -y \
-    make
-
-# install danger-js which is needed for danger-kotlin to work
-RUN npm install -g danger@12.3.4
-
-# install kotlin compiler
-RUN curl -o kotlin-compiler.zip -L https://github.com/JetBrains/kotlin/releases/download/v2.2.21/kotlin-compiler-2.2.21.zip && \
-    unzip -d /usr/local/ kotlin-compiler.zip && \
-    rm -rf kotlin-compiler.zip
-
-# install danger-kotlin
-RUN git clone https://github.com/danger/kotlin.git _danger-kotlin && \
-    cd _danger-kotlin && git checkout 1.3.4 && \
-    make install  && \
-    cd ..  && \
-    rm -rf _danger-kotlin
-
-# setup environment variables
-ENV PATH=$PATH:/usr/local/kotlinc/bin
-
-# flutter
-ENV FLUTTER_CHANNEL="stable"
-ENV FLUTTER_VERSION="3.24.3"
-ENV FLUTTER_URL="https://storage.googleapis.com/flutter_infra_release/releases/$FLUTTER_CHANNEL/linux/flutter_linux_$FLUTTER_VERSION-$FLUTTER_CHANNEL.tar.xz"
-ENV FLUTTER_HOME="/opt/flutter"
-ENV FLUTTER_FILE="flutter.tar.xz"
-
-RUN curl -o $FLUTTER_FILE $FLUTTER_URL \
-  && mkdir -p $FLUTTER_HOME \
-  && tar xf $FLUTTER_FILE -C /opt \
-  && git config --global --add safe.directory /opt/flutter \
-  && rm $FLUTTER_FILE
-
-ENV PATH=$PATH:$FLUTTER_HOME/bin
-
-RUN flutter config --no-analytics \
-  && flutter precache \
-  && yes "y" | flutter doctor --android-licenses \
-  && flutter doctor \
-  && flutter update-packages
-
-# git LFS support
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
-    && apt install -y git-lfs \
-    && git lfs install
-
-# add gitlab helper functions
-ENV GITLAB_CI_UTILS_VERSION=2.7.0
-RUN curl -o helper_functions.sh "https://raw.githubusercontent.com/AckeeDevOps/gitlab-ci-utils/$GITLAB_CI_UTILS_VERSION/scripts/helper_functions.sh" \
-    && curl -o android_ci_functions.sh "https://raw.githubusercontent.com/AckeeCZ/android-gitlab-ci-scripts/v1.0.0/android_ci_functions.sh" \
-    && echo "source helper_functions.sh" >> /etc/profile \
-    && echo "source android_ci_functions.sh" >> /etc/profile
-
-VOLUME /root/.gradle
+
+
+# == danger-installation ==
+
+FROM build AS danger-installation
+
+ARG DANGER_BASE_PATH
+ARG DANGER_JS_VERSION
+ARG DANGER_KOTLIN_VERSION
+ARG DANGER_KOTLIN_CHECKSUM
+ARG KOTLINC_BASE_PATH
+ARG KOTLINC_CHECKSUM
+ARG KOTLINC_VERSION
+
+# chown of directories where danger will be installed, so nonroot npm process can write there
+RUN chown -R nonroot:nonroot "$DANGER_BASE_PATH"
+# Change to nonroot user for npm install to reduce attack surface if compromised
+USER nonroot
+
+# Install danger JS that is needed for danger-kotlin
+RUN npm install -g "danger@$DANGER_JS_VERSION"
+# Solves dockle's DKL-LI-0003 reported issue to remove unnecessary files
+RUN rm -f "$DANGER_BASE_PATH/lib/node_modules/danger/Dockerfile"
+
+# Clone and run shai-hulud-detector script that checks for shai-hulud supply chain attacks
+WORKDIR /tmp
+RUN git clone https://github.com/Cobenian/shai-hulud-detect
+# Allows user to override shai-hulud detector mode. Useful for running --paranoid mode on CI, which
+# takes longer but is more secure and checks even for other malicious behaviour other than shai-hulud.
+ARG SHAI_HULUD_DETECTOR_MODE=""
+RUN ./shai-hulud-detect/shai-hulud-detector.sh "$SHAI_HULUD_DETECTOR_MODE" "$(npm root -g)"; \
+    exit_code=$?; \
+    case "$exit_code" in \
+        # Succeed on medium-risk issues found (2)
+        2) exit 0 ;; \
+        # Fail on high-risk issues found (1), succeed (0) or fail with anything else
+        *) exit "$exit_code" ;; \
+    esac
+
+# Switch back to root to finish Danger installation
+USER root
+
+# Install Kotlin compiler
+ARG COMPILER_ZIP="kotlin-compiler.zip"
+ADD --checksum="$KOTLINC_CHECKSUM" \
+    "https://github.com/JetBrains/kotlin/releases/download/v$KOTLINC_VERSION/kotlin-compiler-$KOTLINC_VERSION.zip" \
+    "./$COMPILER_ZIP"
+RUN unzip "$COMPILER_ZIP" -d "$KOTLINC_BASE_PATH"
+
+# Install danger-kotlin
+ADD --checksum="$DANGER_KOTLIN_CHECKSUM" --unpack=true \
+    "https://github.com/danger/kotlin/releases/download/$DANGER_KOTLIN_VERSION/danger-kotlin-linuxX64.tar" \
+    "$DANGER_BASE_PATH"
+
+
+
+# == git-lfs-installation ==
+
+FROM build AS git-lfs-installation
+
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
+    apt update && apt install -y --no-install-recommends git-lfs
+
+
+
+# == final ==
+
+# Final stage of the image build process. This is the only stage that is kept in the final image.
+# This should mainly copy prepared binaries from other stages.
+FROM base AS final
+
+ARG DANGER_BASE_PATH
+ARG KOTLINC_BASE_PATH
+
+LABEL tag="ackee-gitlab" \
+      author="Ackee 🦄" \
+      description="This Docker image serves as an environment for running Android builds on Gitlab CI in Ackee workspace"
+
+RUN apt update && apt install -y --no-install-recommends \
+    # Needed for danger-js
+    nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=java-installation "$JAVA_HOME" "$JAVA_HOME"
+
+COPY --from=android-sdk-installation "$ANDROID_HOME" "$ANDROID_HOME"
+# Allows nonroot user to modify Android SDK folders, e.g. download new build tools/platforms
+RUN chown -R nonroot:nonroot "$ANDROID_HOME"
+
+# Danger binaries
+ARG DANGER_BIN_PATH="$DANGER_BASE_PATH/bin"
+COPY --from=danger-installation "$DANGER_BIN_PATH" "$DANGER_BIN_PATH"
+
+ARG DANGER_LIB_PATH="$DANGER_BASE_PATH/lib"
+
+# Danger JS node_modules dependencies
+ARG DANGER_NODE_MODULES_PATH="$DANGER_LIB_PATH/node_modules"
+COPY --from=danger-installation "$DANGER_NODE_MODULES_PATH" "$DANGER_NODE_MODULES_PATH"
+
+# danger-kotlin libs
+ARG DANGER_KOTLIN_LIB_PATH="$DANGER_LIB_PATH/danger"
+COPY --from=danger-installation "$DANGER_KOTLIN_LIB_PATH" "$DANGER_KOTLIN_LIB_PATH"
+
+COPY --from=danger-installation "$KOTLINC_BASE_PATH" "$KOTLINC_BASE_PATH"
+ENV PATH="$PATH:$KOTLINC_BASE_PATH/kotlinc/bin"
+
+ARG GIT_LFS_PATH="/usr/bin/git-lfs"
+COPY --from=git-lfs-installation "$GIT_LFS_PATH" "$GIT_LFS_PATH"
+RUN git lfs install
+
+# Remove binaries that might allow privilege escalation
+RUN rm -f /bin/su
+RUN rm -f /usr/bin/apt /usr/bin/apt-get /usr/bin/apt-cache
+RUN rm -f /usr/bin/dpkg
+RUN rm -f /usr/sbin/unix_chkpwd
+
+USER nonroot