diff --git a/.github/workflows/update_version.yml b/.github/workflows/update_version.yml index 7b16018..ee7e74f 100644 --- a/.github/workflows/update_version.yml +++ b/.github/workflows/update_version.yml @@ -217,7 +217,7 @@ jobs: - name: Create commit message variable run: | - echo "COMMIT_MESSAGE=chore(release): update flutter dependencies in version.json for ${{ env.FLUTTER_VERSION }}" >> $GITHUB_ENV + echo "COMMIT_MESSAGE=chore(release): upgrade flutter to ${{ env.FLUTTER_VERSION }}" >> $GITHUB_ENV - name: Generate authentication token with GitHub App to trigger Actions uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 diff --git a/android.Dockerfile b/android.Dockerfile index 38338ba..3d1f98d 100644 --- a/android.Dockerfile +++ b/android.Dockerfile @@ -1,17 +1,17 @@ -FROM debian:12.11-slim@sha256:b1a741487078b369e78119849663d7f1a5341ef2768798f7b7406c4240f86aef AS flutter +FROM debian:12.12-slim@sha256:acd98e6cfc42813a4db9ca54ed79b6f702830bfc2fa43a2c2e87517371d82edb AS flutter SHELL ["/bin/bash", "-euxo", "pipefail", "-c"] ENV LANG=C.UTF-8 # renovate: release=bullseye depName=curl -ARG CURL_VERSION="7.88.1-10+deb12u12" +ARG CURL_VERSION="7.88.1-10+deb12u14" # renovate: release=bullseye depName=git ARG GIT_VERSION="1:2.39.5-0+deb12u2" # renovate: release=bullseye depName=lcov ARG LCOV_VERSION="1.16-1" # renovate: release=bullseye depName=ca-certificates -ARG CA_CERTIFICATES_VERSION="20230311" +ARG CA_CERTIFICATES_VERSION="20230311+deb12u1" # renovate: release=bullseye depName=unzip ARG UNZIP_VERSION="6.0-28" @@ -152,7 +152,7 @@ ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-to # renovate: release=bullseye depName=openjdk-17-jdk-headless 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" +ARG SUDO_VERSION="1.9.13p3-1+deb12u2" USER root RUN apt-get update \ diff --git a/config/flutter_version.json b/config/flutter_version.json index 249b846..b670926 100644 --- a/config/flutter_version.json +++ b/config/flutter_version.json @@ -1,7 +1,7 @@ { "flutter": { "channel": "stable", - "commit": "a402d9a4376add5bc2d6b1e33e53edaae58c07f8", - "version": "3.35.3" + "commit": "d693b4b9dbac2acd4477aea4555ca6dcbea44ba2", + "version": "3.35.4" } } diff --git a/config/version.json b/config/version.json index 8818bd2..8e1aa96 100644 --- a/config/version.json +++ b/config/version.json @@ -1,8 +1,8 @@ { "flutter": { "channel": "stable", - "commit": "a402d9a4376add5bc2d6b1e33e53edaae58c07f8", - "version": "3.35.3" + "commit": "d693b4b9dbac2acd4477aea4555ca6dcbea44ba2", + "version": "3.35.4" }, "android": { "platforms": [ diff --git a/readme.md b/readme.md index 02fdc32..bee94ad 100644 --- a/readme.md +++ b/readme.md @@ -23,7 +23,7 @@ The images includes the minimum tools to run Flutter and build apps. The version ## Features -* Installed Flutter SDK 3.35.3. +* Installed Flutter SDK 3.35.4. * 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. @@ -40,15 +40,15 @@ Predownloaded SDKs and tools in Android: | Registry | flutter-android | | ------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -| Docker Hub | [gmeligio/flutter-android:3.35.3](https://hub.docker.com/r/gmeligio/flutter-android) | -| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.35.3](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) | -| Quay | [quay.io/gmeligio/flutter-android:3.35.3](https://quay.io/repository/gmeligio/flutter-android) | +| Docker Hub | [gmeligio/flutter-android:3.35.4](https://hub.docker.com/r/gmeligio/flutter-android) | +| GitHub Container Registry | [ghcr.io/gmeligio/flutter-android:3.35.4](https://github.com/gmeligio/flutter-docker-image/pkgs/container/flutter-android) | +| Quay | [quay.io/gmeligio/flutter-android:3.35.4](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.35.3 bash +docker run --rm -it ghcr.io/gmeligio/flutter-android:3.35.4 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.35.3 + image: ghcr.io/gmeligio/flutter-android:3.35.4 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.35.3 + image: ghcr.io/gmeligio/flutter-android:3.35.4 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.35.3 -* Flutter version: 3.35.3 +* Docker image: gmeligio/flutter-android:3.35.4 +* Flutter version: 3.35.4 ## Building Locally The android.Dockerfile expects a few arguments: -* `flutter_version `: The version of Flutter to use when building. Example: 3.35.3 +* `flutter_version `: The version of Flutter to use when building. Example: 3.35.4 * `android_build_tools_version `: The version of the Android SDK Build Tools to install. Example: 35.0.0 * `android_platform_versions `: 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.35.3 --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 . +docker build --target android --build-arg flutter_version=3.35.4 --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 diff --git a/script/java_version.sh b/script/java_version.sh new file mode 100644 index 0000000..1b15681 --- /dev/null +++ b/script/java_version.sh @@ -0,0 +1 @@ +java -version 2>&1 | awk -F[\".] '/version/ {print $2}' \ No newline at end of file diff --git a/script/jq_flutter_latest_version.sh b/script/jq_flutter_latest_version.sh new file mode 100644 index 0000000..d180592 --- /dev/null +++ b/script/jq_flutter_latest_version.sh @@ -0,0 +1 @@ +jq -r '.releases[] | select(.channel=="stable") | max_by(.release_date) | .version' \ No newline at end of file