Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable support for dns_opt in compose again #6680

Closed
wants to merge 1 commit into from

Conversation

jeroenpeeters
Copy link

I found that in docker-compose v3 the dns_opt option was not enabled in the config_schema. The option however is correctly passed to the Docker CLI. A test even still exists for this, see tests/integration/service_test.py test_dns_opt_value.

This PR enables the dns_opt again. The schema is a copy from v3.7 with the addition of dns_opt on line 133.

Tested against Docker version 18.09.1, build 4c52b90.

Resolves

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "master" [email protected]:jeroenpeeters/compose.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Copy link

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR enables the dns_opt again. The schema is a copy from v3.7 with the addition of dns_opt on line 133.

Thanks, but if I understand the discussion on #5010 correctly then what we need is for docker/cli#1557 to first be resolved on the cli repo, which will update the appropriate ./cli/compose/schema/data/config_schema_v3.*.json in that repository and then we can sync that schema change to here.

We should not, AIUI, be declaring new schema versions in this repo as is being done in this PR.

@ijc
Copy link

ijc commented May 20, 2019

BTW see #6642 for an attempt at a resync (and the problems caused by editing things directly here).

@phyrwork
Copy link

phyrwork commented Sep 2, 2021

Looks like this has been done since 1.27.0.

@ndeloof
Copy link
Contributor

ndeloof commented Sep 8, 2021

dns_opt indeed has been re-introduced in compose spec.
Closing this PR as "obsolete"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants