Merge branch 'multi_platform_image'

.gitlab-ci.yml

@@ -16,7 +16,6 @@ include:
 "3.24.5":
   extends: .build_flutter_base
   variables:
-    DOCKER_BUILDX_PLATFORMS: linux/amd64
     IMAGE_BASENAME: ${IMAGE_PREFIX}/flutter
     VERSION: 3.24.5
     IMAGE_NAME: ${IMAGE_BASENAME}:${VERSION},${IMAGE_BASENAME}:3.24,${IMAGE_BASENAME}:3

.vscode/tasks.json

@@ -13,6 +13,20 @@
                 ".",
             ],
         },
+        {
+            "label": "buildx build",
+            "command": "docker",
+            "args": [
+                "buildx",
+                "build",
+                "--build-arg",
+                "FLUTTER_VERSION=${input:flutterVersion}",
+                "--platform",
+                "linux/arm64,linux/amd64",
+                ".",
+            ],
+        },
+
     ],
     "inputs": [
         {

Dockerfile

@@ -13,11 +13,23 @@ ARG FLUTTER_DIR="$DEPENDENCY_DIR/${FLUTTER_DIR}"
 ARG FLUTTER_DOWNLOAD_FILE="flutter.tar.xz"
 
 RUN apt update \
-    && apt install -y wget xz-utils
+    && apt install -y wget xz-utils git curl unzip
 
-RUN mkdir -p ${FLUTTER_DIR} \
-    && wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz -O ${FLUTTER_DOWNLOAD_FILE} \
-    && tar -xf ${FLUTTER_DOWNLOAD_FILE} --strip-components=1 --directory $FLUTTER_DIR
+RUN mkdir -p ${FLUTTER_DIR}
+
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+    wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz -O ${FLUTTER_DOWNLOAD_FILE} \
+    && tar -xf ${FLUTTER_DOWNLOAD_FILE} --strip-components=1 --directory $FLUTTER_DIR; \
+    fi
+
+# Flutter on arch currently has warnings because channel and repository source are not set
+RUN if [ "$(uname -m)" = "aarch64" ]; then \
+    git clone https://github.com/flutter/flutter.git ${FLUTTER_DIR} \
+    && cd ${FLUTTER_DIR} \
+    && git fetch origin tag ${FLUTTER_VERSION} \
+    && git checkout tags/${FLUTTER_VERSION} \
+    && ${FLUTTER_DIR}/bin/flutter doctor; \
+    fi
 
 
 FROM alpine:3.20.3