.gitlab-ci.yml

 include:
 - project: docker-images/templates
   ref: master
-  file: images.gitlab-ci.yml
+  file: docker_hub.gitlab-ci.yml
 
 build:
   extends: .build_image_job_template
   variables:
     DOCKER_BUILDX_PLATFORMS: linux/amd64
-    IMAGE_NAME: $IMAGE_SERVER/flutter:3.24.0-android
+    TAG_SUFFIX: android
+    IMAGE_BASENAME: ${IMAGE_PREFIX}/flutter
+    IMAGE_NAME: ${IMAGE_BASENAME}:3.24.0-${TAG_SUFFIX},${IMAGE_BASENAME}:3.24-${TAG_SUFFIX},${IMAGE_BASENAME}:3-${TAG_SUFFIX}

Dockerfile

@@ -21,9 +21,7 @@ RUN apt update \
     && mkdir -p $TMP_DEPENDENCIES_DIR \
     && wget "https://dl.google.com/android/repository/commandlinetools-linux-${CMDLINETOOLS_VERSION}_latest.zip" -O $CMDLINETOOLS_ZIP \
     && unzip -q $CMDLINETOOLS_ZIP -d $TMP_DIR \
-    && mv $TMP_DIR/cmdline-tools/* $CMDLINETOOLS_DIR \
-    && mkdir -p ${APP_DIR} \
-    && wget "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar" -O ${BUNDLETOOL_FILE}
+    && mv $TMP_DIR/cmdline-tools/* $CMDLINETOOLS_DIR
 
 
 FROM andrijoos/flutter:3.24.0
@@ -36,9 +34,16 @@ ENV ANDROID_HOME=$ANDROID_HOME
 
 COPY --from=download $DEPENDENCY_DIR /
 
-RUN apk add --no-cache openjdk17-jdk \
+USER root
+
+RUN apk add --no-cache openjdk17-jdk libgcc \
     && rm -rf /tmp/* \
-    && yes "y" | flutter doctor --android-licenses \
+    && chown -R flutter:flutter ${ANDROID_HOME} \
+    && chown -R flutter:flutter /tmp
+
+USER flutter
+
+RUN yes "y" | flutter doctor --android-licenses \
     && dart --disable-analytics \
     && flutter config --no-analytics --enable-android \
     && flutter precache --universal --android \