Unverified Commit 9372f861 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Update the Dockerfile to use the master firebase-tools, tweak scripts (#23279)

parent fbb01eab
...@@ -82,7 +82,7 @@ ENV PATH="$GRADLE_ROOT/bin:$PATH" ...@@ -82,7 +82,7 @@ ENV PATH="$GRADLE_ROOT/bin:$PATH"
ENV PATH="/usr/bin:${PATH}" ENV PATH="/usr/bin:${PATH}"
RUN dpkg-query -L nodejs RUN dpkg-query -L nodejs
# Install Firebase # Install Firebase
RUN /usr/bin/npm install -g firebase-tools RUN /usr/bin/npm install -g git://github.com/firebase/firebase-tools.git
# Set locale to en_US # Set locale to en_US
RUN locale-gen en_US "en_US.UTF-8" && dpkg-reconfigure locales RUN locale-gen en_US "en_US.UTF-8" && dpkg-reconfigure locales
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
TAG="${CIRRUS_TAG:-latest}" TAG="${CIRRUS_TAG:-latest}"
# pull to make sure we are not rebuilding for nothing # pull to make sure we are not rebuilding for nothing
docker pull "gcr.io/flutter-cirrus/build-flutter-image:$TAG" sudo docker pull "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
docker build --tag "gcr.io/flutter-cirrus/build-flutter-image:$TAG" . sudo docker build "$@" --tag "gcr.io/flutter-cirrus/build-flutter-image:$TAG" .
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
if [[ -n "$CIRRUS_CI" && -n "$GCLOUD_CREDENTIALS" ]]; then if [[ -n "$CIRRUS_CI" && -n "$GCLOUD_CREDENTIALS" ]]; then
echo "$GCLOUD_CREDENTIALS" | base64 --decode | docker login -u _json_key --password-stdin https://gcr.io echo "$GCLOUD_CREDENTIALS" | base64 --decode | docker login -u _json_key --password-stdin https://gcr.io
else else
gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin https://gcr.io gcloud auth print-access-token | sudo docker login -u oauth2accesstoken --password-stdin https://gcr.io
fi fi
\ No newline at end of file
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
TAG="${CIRRUS_TAG:-latest}" TAG="${CIRRUS_TAG:-latest}"
docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG" sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment