Skip to content

Commit

Permalink
Remove docker_build option
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 16, 2016
1 parent 4ce46ff commit 17a2aee
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions lib/dpl/provider/gae.rb
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
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 17a2aee

Please sign in to comment.