From 657d9db195ffea784164f7bfec8b74a5142cb747 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 15 Apr 2021 16:56:16 -0700 Subject: [PATCH] windows: upgrade flutter to dev; add android license(fix parent container) --- Dockerfile | 5 ----- windows/Dockerfile | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 971be64..0000000 --- a/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM cirrusci/flutter:dev - -RUN apt-get update -RUN apt-get install -y --no-install-recommends cmake ninja-build clang build-essential pkg-config libgtk-3-dev liblzma-dev lcov -RUN flutter config --enable-linux-desktop diff --git a/windows/Dockerfile b/windows/Dockerfile index 2e1e6c7..4d61f5a 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -21,9 +21,19 @@ RUN C:/TEMP/vs_buildtools.exe --quiet --wait --norestart --nocache \ # Install Flutter -ADD https://storage.googleapis.com/flutter_infra/releases/stable/windows/flutter_windows_2.0.4-stable.zip C:/TEMP/flutter.zip +# ADD https://storage.googleapis.com/flutter_infra/releases/stable/windows/flutter_windows_2.0.4-stable.zip C:/TEMP/flutter.zip +# RUN powershell -Command "expand-archive -Path 'C:\TEMP\flutter.zip' -DestinationPath 'c:\'" -#CMD ["powershell.exe", "Expand-Archive -LiteralPath 'C:\\TEMP\\flutter.zip' -DestinationPath 'C:\\'"] -RUN powershell -Command "expand-archive -Path 'C:\TEMP\flutter.zip' -DestinationPath 'c:\'" +RUN setx path "%path%;C:\flutter\bin;C:\flutter\bin\cache\dart-sdk\bin;" -RUN setx path "%path%;C:\flutter\bin" +RUN git clone --branch dev https://github.com/flutter/flutter.git C:\flutter + +RUN flutter config --no-analytics + +RUN flutter config --enable-windows-desktop + +# Fix android sdk licenses (missing) +RUN powershell.exe -Command \ + Set-Content -Value "`n859f317696f67ef3d7f30a50a5560e7834b43903" -Path C:\Android\licenses\android-sdk-arm-dbt-license + +RUN flutter doctor -v