Merge branch 'update_flutter'

.gitlab-ci.yml

@@ -7,4 +7,4 @@ build:
   extends: .build_image_job_template
   variables:
     DOCKER_BUILDX_PLATFORMS: linux/amd64
-    IMAGE_NAME: $IMAGE_SERVER/flutter:3.19.0-android
+    IMAGE_NAME: $IMAGE_SERVER/flutter:3.24.0-android

Dockerfile

-ARG IMAGE_SERVER
+ARG IMAGE_SERVER="registry.420joos.dev"
 ARG DEPENDENCY_DIR="/tmp/dependencies"
 ARG ANDROID_HOME="/opt/android"
-ARG BUNDLETOOL_VERSION="1.15.6"
 
-FROM $IMAGE_SERVER/ubuntu:22.04 as download
+FROM $IMAGE_SERVER/ubuntu:22.04 AS download
 
 ARG DEPENDENCY_DIR
 ARG ANDROID_HOME
@@ -13,7 +12,7 @@ ARG CMDLINETOOLS_VERSION="11076708"
 ARG CMDLINETOOLS_ZIP="/tmp/cmdline-tools.zip"
 ARG TMP_DIR="/tmp"
 ARG CMDLINETOOLS_DIR="$ANDROID_HOME_DEPENDENCY_DIR/cmdline-tools/latest"
-ARG BUNDLETOOL_VERSION
+ARG BUNDLETOOL_VERSION="1.17.1"
 ARG APP_DIR="$DEPENDENCY_DIR/app"
 ARG BUNDLETOOL_FILE="${APP_DIR}/bundletool.jar"
 
@@ -28,12 +27,12 @@ RUN apt update \
     && wget "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar" -O ${BUNDLETOOL_FILE}
 
 
-FROM $IMAGE_SERVER/flutter:3.19.0
+FROM $IMAGE_SERVER/flutter:3.24.0
 
 ARG DEPENDENCY_DIR
 ARG ANDROID_HOME
 
-ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools"
+ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools"
 ENV ANDROID_HOME=$ANDROID_HOME
 
 COPY --from=download $DEPENDENCY_DIR /