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.

Sign up for GitHub

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

Jump to bottom

Remove obsolete "version" value from example docker-compose.yml since… #1568

Closed
wants to merge 3 commits into from
Closed

Remove obsolete "version" value from example docker-compose.yml since… #1568

wants to merge 3 commits into from

Conversation

lemondjeff
Copy link
Contributor

@lemondjeff lemondjeff commented Apr 19, 2024 •
edited
Loading

Description

Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented."

Motivation and Context

Fixes issue #1562.

How Has This Been Tested?

Viewed README.md and verified that Version is no longer specified in the example docker-compose.yml.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

@lemondjeff lemondjeff mentioned this pull request Apr 19, 2024
Merged
6 tasks
@lemondjeff lemondjeff force-pushed the development-v6-issue-1562 branch from e702058 to b1455fe Compare April 20, 2024 15:26
@lemondjeff
Copy link
Contributor Author

Updated PR to remove version from examples/docker-compose-caddy-proxy.yml as well.

@lemondjeff lemondjeff force-pushed the development-v6-issue-1562 branch from b1455fe to 10b6717 Compare April 20, 2024 15:30
@PromoFaux
Copy link
Member

image

You may be missing commits from development-v6 here? Not sure.. I could update your branch with a merge commit, but might be cleaner to rebase and force push...

@PromoFaux
Copy link
Member

(odd message though, as I don't recall merging anything into development-v6 since you created this PR!!)

@lemondjeff
Remove obsolete "version" value from example docker-compose.yml in RE…
36c4118 
…ADME.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented."

See: https://github.com/compose-spec/compose-spec/blob/master/04-version-and-name.md

Signed-off-by: Jeff Miller <lemondjeff@gmail.com>
@lemondjeff lemondjeff force-pushed the development-v6-issue-1562 branch from 10b6717 to 36c4118 Compare April 20, 2024 17:04
@lemondjeff
Copy link
Contributor Author

lemondjeff commented Apr 20, 2024 •
edited
Loading

(odd message though, as I don't recall merging anything into development-v6 since you created this PR!!)

Yeah, I'm not sure what's wrong. I checked out a new local copy of the development-v6-issue-1562 branch, rebased and made and reverted a change, then force pushed again.

@rdwebdesign
Copy link
Member

@lemondjeff

Looking at your fork, your branch development-v6 is 4 commits behind our branch:

image

Did you try to use the "Sync fork" button to update your branch?

@lemondjeff
Copy link
Contributor Author

Did you try to use the "Sync fork" button to update your branch?

Hmm, the Sync fork button for my development-v6-issue-1562 branch seems to want to sync with pi-hole/docker-pi-hole:master, even though I created the branch from pi-hole/docker-pi-hole:development-v6. I'm not sure how to fix this.

@lemondjeff
Copy link
Contributor Author

I just used the Merge branch button, which added more commits on top of my original commit. I give up, I'm going to close this PR and start with a new branch from development-v6.

@lemondjeff lemondjeff closed this Apr 20, 2024
@lemondjeff
Copy link
Contributor Author

Opened a new PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdwebdesign rdwebdesign rdwebdesign approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lemondjeff @PromoFaux @rdwebdesign