GitHub/flutter-docker-image
1
0
Fork 0
mirror of https://github.com/gmeligio/flutter-docker-image.git synced 2026-05-24 12:30:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(release): update flutter dependencies in version.json for 3.35.1 (#371)

Browse Source 
Co-authored-by: verified-commit[bot] <180343340+verified-commit[bot]@users.noreply.github.com>
Co-authored-by: Eligio Mariño <22875166+gmeligio@users.noreply.github.com>
This commit is contained in:
verified-commit[bot]
2025-08-17 18:36:51 +02:00
committed by GitHub
parent c9e5d504a0
commit a290bf28c3
9 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2
View File
@@ -0,0 +1,2 @@
# Normalize all text files to LF in repo, checkout CRLF on Windows
* text=auto eol=lf
android.Dockerfile
+1 -1
View File
@@ -150,7 +150,7 @@ ENV ANDROID_HOME="$SDK_ROOT/android-sdk" \
ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$HOME/.local/bin"
# renovate: release=bullseye depName=openjdk-17-jdk-headless
ARG OPENJDK_17_JDK_HEADLESS_VERSION="17.0.15+6-1~deb12u1"
ARG OPENJDK_17_JDK_HEADLESS_VERSION="17.0.16+8-1~deb12u1"
# renovate: release=bullseye depName=sudo
ARG SUDO_VERSION="1.9.13p3-1+deb12u1"
config/android.cue
+47 -10
View File
@@ -1,3 +1,17 @@
package config
import "list"
#CommandTests: {
name: _
setup?: _
teardown?: _
command: _
args: _
expectedOutput?: [string]
excludedOutput?: _
}
#FileContentTests: {
name: string
path: _
@@ -6,24 +20,47 @@
#ContainerStructureTest: {
schemaVersion: _
commandTests: _
commandTests: [...#CommandTests]
fileContentTests: [...#FileContentTests]
}
input: #ContainerStructureTest
android_cmdline_tools_version: string @tag(android_cmdline_tools_version)
android_cmdline_tools_test_expected_content: string @tag(android_cmdline_tools_test_expected_content)
android_cmdline_tools_version: string @tag(android_cmdline_tools_version)
android_ndk_version: string @tag(android_ndk_version)
android_sdk_build_tools_version: string @tag(android_sdk_build_tools_version)
output: {
schemaVersion: input.schemaVersion
commandTests: input.commandTests
fileContentTests: [
{
name: "Android SDK Command-line Tools is version \(android_cmdline_tools_version)"
path: input.fileContentTests[0].path
expectedContents: [android_cmdline_tools_test_expected_content]
commandTests: list.Concat([
list.Take(input.commandTests, 1),
[
{
name: input.commandTests[1].name
command: input.commandTests[1].command
args: input.commandTests[1].args
expectedOutput: [android_sdk_build_tools_version]
},
{
name: input.commandTests[2].name
command: input.commandTests[2].command
args: input.commandTests[2].args
expectedOutput: [android_ndk_version]
}
],
list.Drop(input.commandTests, 3),
])
fileContentTests: list.Concat([
if len(input.fileContentTests) > 0 {
[{
name: "Android SDK Command-line Tools is version \(android_cmdline_tools_version)"
path: input.fileContentTests[0].path
expectedContents: [android_cmdline_tools_test_expected_content]
}],
},
input.fileContentTests[1]
]
list.Drop(input.fileContentTests, 1),
])
}
config/flutter_version.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"flutter": {
"channel": "stable",
"commit": "edada7c56edf4a183c1735310e123c7f923584f1",
"version": "3.32.8"
"commit": "20f82749394e68bcfbbeee96bad384abaae09c13",
"version": "3.35.1"
}
}
config/version.json
+5 -5
View File
@@ -1,26 +1,26 @@
{
"flutter": {
"channel": "stable",
"commit": "edada7c56edf4a183c1735310e123c7f923584f1",
"version": "3.32.8"
"commit": "20f82749394e68bcfbbeee96bad384abaae09c13",
"version": "3.35.1"
},
"android": {
"platforms": [
{
"version": 35
"version": 36
}
],
"gradle": {
"version": "8.12"
},
"buildTools": {
"version": "34.0.0"
"version": "35.0.0"
},
"cmdlineTools": {
"version": "19.0"
},
"ndk": {
"version": "26.3.11579264"
"version": "27.0.12077973"
},
"cmake": {
"version": "3.22.1"
readme.md
+15 -15
View File
@@ -23,7 +23,7 @@ The images includes the minimum tools to run Flutter and build apps. The version
## Features
* Installed Flutter SDK 3.32.8.
* Installed Flutter SDK 3.35.1.
* Analytics disabled by default, opt-in if `ENABLE_ANALYTICS` environment variable is passed when running the container.
* Rootless user `flutter:flutter`, with permissions to run on Github workflows and GitLab CI.
* Cached Fastlane gem 2.228.0.
@@ -32,23 +32,23 @@ The images includes the minimum tools to run Flutter and build apps. The version
Predownloaded SDKs and tools in Android:
* Licenses accepted
* Android SDK Platforms: 35
* Android NDK: 26.3.11579264
* Android SDK Platforms: 36
* Android NDK: 27.0.12077973
* Gradle: 8.12
## Running Containers
| Registry | flutter-android |
| ------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
| Docker Hub | [gmeligio/flutter-android:3.32.8](https://hub.docker.com/r/gmeligio/flutter-android) |
| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.32.8](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) |
| Quay | [quay.io/gmeligio/flutter-android:3.32.8](https://quay.io/repository/gmeligio/flutter-android) |
| Docker Hub | [gmeligio/flutter-android:3.35.1](https://hub.docker.com/r/gmeligio/flutter-android) |
| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.35.1](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) |
| Quay | [quay.io/gmeligio/flutter-android:3.35.1](https://quay.io/repository/gmeligio/flutter-android) |
On the terminal:
```bash
# From GitHub Container Registry
docker run --rm -it ghcr.io/gmeligio/flutter-android:3.32.8 bash
docker run --rm -it ghcr.io/gmeligio/flutter-android:3.35.1 bash
```
On a workflow in GitHub Actions:
@@ -58,7 +58,7 @@ jobs:
build:
runs-on: ubuntu-22.04
container:
image: ghcr.io/gmeligio/flutter-android:3.32.8
image: ghcr.io/gmeligio/flutter-android:3.35.1
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -70,7 +70,7 @@ On a `.gitlab-ci.yml` in GitLab CI:
```yaml
build:
image: ghcr.io/gmeligio/flutter-android:3.32.8
image: ghcr.io/gmeligio/flutter-android:3.35.1
script:
- flutter build apk
```
@@ -91,20 +91,20 @@ bundle exec fastlane
Every new tag on the flutter stable channel gets built. The tag is composed of the Flutter version used to build the image:
* Docker image: gmeligio/flutter-android:3.32.8
* Flutter version: 3.32.8
* Docker image: gmeligio/flutter-android:3.35.1
* Flutter version: 3.35.1
## Building Locally
The android.Dockerfile expects a few arguments:
* `flutter_version <string>`: The version of Flutter to use when building. Example: 3.32.8
* `android_build_tools_version <string>`: The version of the Android SDK Build Tools to install. Example: 34.0.0
* `android_platform_versions <list>`: The versions of the Android SDK Platforms to install, separated by spaces. Example: 35
* `flutter_version <string>`: The version of Flutter to use when building. Example: 3.35.1
* `android_build_tools_version <string>`: The version of the Android SDK Build Tools to install. Example: 35.0.0
* `android_platform_versions <list>`: The versions of the Android SDK Platforms to install, separated by spaces. Example: 36
```bash
# Android
docker build --target android --build-arg flutter_version=3.32.8 --build-arg fastlane_version=2.228.0 --build-arg android_build_tools_version=34.0.0 --build-arg android_platform_versions="35" -t android-test .
docker build --target android --build-arg flutter_version=3.35.1 --build-arg fastlane_version=2.228.0 --build-arg android_build_tools_version=35.0.0 --build-arg android_platform_versions="36" -t android-test .
```
## Roadmap
script/latest_android_sdk_build_tools.sh
+3
View File
@@ -1 +1,4 @@
sdkmanager --list | grep 'build-tools' | awk '{print $1}' | grep -oP 'build-tools;\d+\.\d+\.\d+$' | tail -1
# Get 36.0.0 from `build-tools;36.0.0:build-tools`
curl -s https://raw.githubusercontent.com/flutter/flutter/refs/tags/3.35.1/engine/src/flutter/tools/android_sdk/packages.txt | grep 'build-tools' | awk -F'[;:]' '{print $2}'
script/update_test.sh
+4 -3
View File
@@ -1,5 +1,4 @@
#!/usr/bin/env sh
# TODO: Update all versions used in android.yml from version.json, like NDK, CMake, etc.
# Path to the JSON and YAML files
@@ -12,6 +11,8 @@ android_cmdline_tools_version=$(cue eval -e 'android.cmdlineTools.version' "$ver
android_cmdline_tools_test_expected_content="Pkg.Revision=$android_cmdline_tools_version
Pkg.Path=cmdline-tools;$android_cmdline_tools_version
Pkg.Desc=Android SDK Command-line Tools"
android_ndk_version=$(cue eval -e 'android.ndk.version' "$version_file_path" | tr -d '"')
android_sdk_build_tools_version=$(cue eval -e 'android.buildTools.version' "$version_file_path" | tr -d '"')
# Check if the version value is not empty
if [ -z "$android_cmdline_tools_version" ]; then
@@ -21,8 +22,8 @@ fi
# Update the version YAML file using cue
cue export config/android.cue -l input: ./test/android.yml -t android_cmdline_tools_version="$android_cmdline_tools_version" -t android_cmdline_tools_test_expected_content="$android_cmdline_tools_test_expected_content" -e output --out yaml >"$temp_file_path"
cue export config/android.cue -l input: ./test/android.yml -t android_cmdline_tools_version="$android_cmdline_tools_version" -t android_cmdline_tools_test_expected_content="$android_cmdline_tools_test_expected_content" -t android_ndk_version="$android_ndk_version" -t android_sdk_build_tools_version="$android_sdk_build_tools_version" -e output --out yaml >"$temp_file_path"
mv "$temp_file_path" "$test_file_path"
# Write progress
echo "Updated $test_file_path with android_cmdline_tools_version: $android_cmdline_tools_version"
echo "Updated $test_file_path with android_cmdline_tools_version=$android_cmdline_tools_version, android_ndk_version=$android_ndk_version"
test/android.yml
+2 -2
View File
@@ -24,13 +24,13 @@ commandTests:
args:
- /home/flutter/sdks/android-sdk/build-tools
expectedOutput:
- 34.0.0
- 35.0.0
- name: Android NDK is pinned
command: ls
args:
- /home/flutter/sdks/android-sdk/ndk
expectedOutput:
- 26.3.11579264
- 27.0.12077973
- name: CMake is pinned
command: ls
args: