From 29fd0469ed38e7f81a3e73bbdf06b89907bdba95 Mon Sep 17 00:00:00 2001 From: godofredoc Date: Mon, 31 Jan 2022 18:06:27 -0800 Subject: [PATCH] Pin dependencies in docker file. (#97466) * Pin dependencies in docker file. The docker file had two dependencies that were not locked. An npm dependency and the debian base image. This PR pins those two dependencies. * Use the slim version of debian image. * Use image with bigger disk to build docker images. * remove web_engine_tests from cirrus. --- .cirrus.yml | 20 +------------------- dev/ci/docker_linux/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1da3b938cba..8a3c5938c3f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,7 +18,7 @@ gcp_credentials: ENCRYPTED[!cc769765170bebc37e0556e2da5915ca64ee37f4ec8c966ec147 task: gke_container: dockerfile: "dev/ci/docker_linux/Dockerfile" - builder_image_name: docker-builder # gce vm image + builder_image_name: docker-builder-linux # gce vm image builder_image_project: flutter-cirrus cluster_name: test-cluster zone: us-central1-a @@ -156,21 +156,3 @@ task: - git fetch origin master:master # The actual logic is in a shell script so that it can be shared between CIs. - (cd dev/customer_testing/; ./ci.sh) - - - name: web_smoke_test - only_if: "changesInclude('.cirrus.yml', 'examples/hello_world/**' ,'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'packages/flutter_web_plugins/**', 'bin/**') && $CIRRUS_PR != ''" - environment: - # Tests Hello World with Flutter Web Engine using Flutter Driver. Should not need more resources. - CPU: 2 - MEMORY: 2G - CHROME_NO_SANDBOX: true - script: - - flutter config --enable-web - - git clone https://github.com/flutter/web_installers.git - - cd web_installers/packages/web_drivers/ - - dart __deprecated_pub get - - dart lib/web_driver_installer.dart chromedriver --install-only - - chromedriver/chromedriver --port=4444 & - - sleep 1 - - cd ../../../examples/hello_world/ - - flutter drive --target=test_driver/smoke_web_engine.dart -d web-server --profile --browser-name=chrome diff --git a/dev/ci/docker_linux/Dockerfile b/dev/ci/docker_linux/Dockerfile index 292d036b89b..e82fe2b0562 100644 --- a/dev/ci/docker_linux/Dockerfile +++ b/dev/ci/docker_linux/Dockerfile @@ -12,7 +12,7 @@ # Last manual update 2021-09-24 (changing this comment will re-build image) -FROM debian:bullseye +FROM debian@sha256:4c25ffa6ef572cf0d57da8c634769a08ae94529f7de5be5587ec8ce7b9b50f9c MAINTAINER Flutter Developers RUN apt-get update -y && \ @@ -101,7 +101,7 @@ ENV PATH="/usr/bin:${PATH}" RUN dpkg-query -L nodejs # Install Firebase # This is why we need nodejs installed. -RUN /usr/bin/npm --verbose install -g firebase-tools +RUN /usr/bin/npm --verbose install -g firebase-tools@10.1.2 # Install golang more recent than in repo (necessary for dashing to build) RUN curl 'https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz' | tar xvz