Skip to content

Commit

Permalink
Remove docker_build option for Google App Engine.
Browse files Browse the repository at this point in the history
`docker_build` option has already been deprecated in gcloud
v112.0.0 and removed in gcloud v114.0.0

If we keep this option, we will get this error messsage:

```
ERROR: (gcloud.preview.app.deploy) Docker builds now use Container
Builder by default. To run a Docker build on
your own host, you can run:
    docker build -t gcr.io/<project>/<service.version> .
    gcloud docker push gcr.io/<project>/<service.version>
    gcloud preview app deploy --image-url=gcr.io/<project>/<service.version>
```
  • Loading branch information
shunyi authored and shunyi committed Jun 21, 2016
1 parent 135fda2 commit a3d4f51
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,6 @@ In order to use this provider, please make sure you have the [App Engine Admin A
* **version**: The version of the app that will be created or replaced by this deployment. If you do not specify a version, one will be generated for you. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
* **no_promote**: Flag to not promote the deployed version. See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)
* **verbosity**: Let's you adjust the verbosity when invoking `"gcloud"`. Defaults to `"warning"`. See [`gcloud`](https://cloud.google.com/sdk/gcloud/reference/).
* **docker_build**: If deploying a Managed VM, specifies where to build your image. Typical values are `"remote"` to build on Google Cloud Engine and `"local"` which requires Docker to be set up properly (to utilize this on Travis CI, read [Using Docker on Travis CI](http://blog.travis-ci.com/2015-08-19-using-docker-on-travis-ci/)). Defaults to `"remote"`.
* **no_stop_previous_version**: Flag to prevent your deployment from stopping the previously promoted version. This is from the future, so might not work (yet). See [`gcloud preview app deploy`](https://cloud.google.com/sdk/gcloud/reference/preview/app/deploy)

#### Environment variables:
Expand Down
5 changes: 0 additions & 5 deletions lib/dpl/provider/gae.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ def verbosity
options[:verbosity] || 'warning'
end

def docker_build
options[:docker_build] || 'remote'
end

def no_stop_previous_version
options[:no_stop_previous_version]
end
Expand All @@ -77,7 +73,6 @@ def push_app
command << " --project \"#{project}\""
command << " preview app deploy \"#{config}\""
command << " --version \"#{version}\""
command << " --docker-build \"#{docker_build}\""
command << " --#{no_promote ? 'no-' : ''}promote"
command << (no_stop_previous_version ? ' --no-stop-previous-version' : '')
unless context.shell(command)
Expand Down
2 changes: 1 addition & 1 deletion spec/provider/gae_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

describe '#push_app' do
example 'with defaults' do
allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" preview app deploy \"app.yaml\" --version \"\" --docker-build \"remote\" --promote").and_return(true)
allow(provider.context).to receive(:shell).with("#{DPL::Provider::GAE::GCLOUD} --quiet --verbosity \"warning\" --project \"test\" preview app deploy \"app.yaml\" --version \"\" --promote").and_return(true)
provider.push_app
end
end
Expand Down

0 comments on commit a3d4f51

Please sign in to comment.