[go: nahoru, domu]

Skip to content

Commit

Permalink
Pin dependencies in docker file. (flutter#97466)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
godofredoc committed Feb 1, 2022
1 parent fd5120b commit 29fd046
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
20 changes: 1 addition & 19 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions dev/ci/docker_linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <flutter-dev@googlegroups.com>

RUN apt-get update -y && \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 29fd046

Please sign in to comment.