diff --git a/kettle/Dockerfile b/kettle/Dockerfile index e1168ead2c82b..a1b765191c157 100644 --- a/kettle/Dockerfile +++ b/kettle/Dockerfile @@ -35,8 +35,9 @@ RUN pip3 install requests google-cloud-pubsub==2.1.0 google-cloud-bigquery==2.2. RUN curl -fsSL https://downloads.python.org/pypy/pypy3.6-v7.3.1-linux64.tar.bz2 | tar xj -C opt && \ ln -s /opt/pypy*/bin/pypy3 /usr/bin -RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-294.0.0-linux-x86_64.tar.gz | tar xfz - -C . && \ - ./google-cloud-sdk/install.sh -q && \ +RUN curl -o installer https://sdk.cloud.google.com && \ + bash installer --disable-prompts --install-dir=/ && \ + rm installer && \ ln -s /google-cloud-sdk/bin/* /bin/ ADD *.py schema.json runner.sh buckets.yaml /kettle/ diff --git a/kettle/cloudbuild.yaml b/kettle/cloudbuild.yaml index c063622d8449a..7e05e1d754b40 100644 --- a/kettle/cloudbuild.yaml +++ b/kettle/cloudbuild.yaml @@ -2,7 +2,7 @@ steps: - name: gcr.io/cloud-builders/docker args: [ 'build', '-t', 'gcr.io/$PROJECT_ID/kettle:$_GIT_TAG', '.' ] dir: kettle/ - timeout: 1200s + timeout: 2000s - name: gcr.io/cloud-builders/docker args: [ 'tag', 'gcr.io/$PROJECT_ID/kettle:$_GIT_TAG', 'gcr.io/$PROJECT_ID/kettle:latest'] substitutions: @@ -10,4 +10,4 @@ substitutions: images: - 'gcr.io/$PROJECT_ID/kettle:$_GIT_TAG' - 'gcr.io/$PROJECT_ID/kettle:latest' -timeout: 1260s +timeout: 2060s