Merge pull request #29 from glazrtom/fix-dockerfile

Upgrade dockerfile and fix issues

Author: davidbilik

.gitignore

@@ -0,0 +1 @@
+.idea/

CHANGELOG.MD

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update danger kotlin to 1.3.4
 - Update kotlin compiler for danger kotlin to 2.2.21
 - Update danger js to 12.3.4
+- Update debian version to `trixie`
+- Added repository and key for Google cloud CLI package
+- Fixed other non-working apt dependencies
+- Minor refactor of environment variables
 
 ### Removed
 - Remove env variable previously added for Dependency-Check plugin

Dockerfile

@@ -1,36 +1,38 @@
-FROM debian:buster
+FROM debian:trixie
 
 LABEL tag="ackee-gitlab" \
       author="Ackee 🦄" \
       description="This Docker image serves as an environment for running Android builds on Gitlab CI in Ackee workspace"
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt-get update && apt-get install -y \
+RUN apt update && apt install -y \
     curl \
     git \
-    libgl1-mesa-glx \
+    libgl1 \
     unzip \
     zip \
-    python \
+    python3 \
     wget \
-    fontconfig
+    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 PATH "$PATH:$JAVA_HOME/bin"
+ENV JAVA_HOME=/root/.sdkman/candidates/java/current
+ENV ANDROID_HOME=/opt/android-sdk-linux
+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
 
-ENV PATH "$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools"
+ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools"
 
 # Accept licenses before installing components
 # License is valid for all the standard components in versions installed from this file
@@ -44,17 +46,11 @@ RUN sdkmanager $(sdkmanager --list 2> /dev/null | grep platforms | awk -F' ' '{p
 # 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)
 
-# install gcloud
-RUN wget -q https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-334.0.0-linux-x86_64.tar.gz -O g.tar.gz && \
-    tar xf g.tar.gz && \
-    rm g.tar.gz && \
-    mv google-cloud-sdk /opt/google-cloud-sdk && \
-    /opt/google-cloud-sdk/install.sh -q && \
-    /opt/google-cloud-sdk/bin/gcloud config set component_manager/disable_update_check true
-# add gcloud SDK to path
-ENV PATH="${PATH}:/opt/google-cloud-sdk/bin/"
-
-## Danger-kotlin dependencies
+# 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 \
@@ -75,7 +71,7 @@ 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-get update && apt-get install -y \
+RUN apt update && apt install -y \
     make
 
 # install danger-js which is needed for danger-kotlin to work
@@ -101,12 +97,13 @@ 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.tar.xz $FLUTTER_URL \
+RUN curl -o $FLUTTER_FILE $FLUTTER_URL \
   && mkdir -p $FLUTTER_HOME \
-  && tar xf flutter.tar.xz -C /opt \
+  && tar xf $FLUTTER_FILE -C /opt \
   && git config --global --add safe.directory /opt/flutter \
-  && rm flutter.tar.xz
+  && rm $FLUTTER_FILE
 
 ENV PATH=$PATH:$FLUTTER_HOME/bin
 
@@ -118,11 +115,11 @@ RUN flutter config --no-analytics \
 
 # git LFS support
 RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
-    && apt-get install -y git-lfs \
+    && apt install -y git-lfs \
     && git lfs install
 
 # add gitlab helper functions
-ENV GITLAB_CI_UTILS_VERSION 2.7.0
+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 \