8000 image/spec: merge history of the v1, v1.1 and v1.2 specification by thaJeztah · Pull Request #46374 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

image/spec: merge history of the v1, v1.1 and v1.2 specification #46374

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
Merged
merged 7 commits into from
Aug 30, 2023
Merged

image/spec: merge history of the v1, v1.1 and v1.2 specification #46374

merged 7 commits into from
Aug 30, 2023

Conversation

thaJeztah
Copy link
Member
@thaJeztah thaJeztah commented 8000 Aug 30, 2023

Thanks to some nice StackOverflow post for an approach;

This combines the 3 separate files, and preserving history (well, with
the help of git log --follow image/spec/spec.md).

git checkout master
git checkout -b image_spec_combined
git mv image/spec/v1.md image/spec/spec.md
# git commit .....

git checkout master
git checkout -b image_spec_1.1
git mv image/spec/v1.1.md image/spec/spec.md
# git commit .....

git checkout master
git checkout -b image_spec_1.2
git mv image/spec/v1.2.md image/spec/spec.md
# git commit .....


# merge the branches (after resolving conflicts)
git checkout image_spec_combined
git merge -S --signoff image_spec_1.1
git merge -S --signoff image_spec_1.2

To view the combined history:

git log --follow image/spec/spec.md

commit 939675dd24b4c765fce1c4f9286a3ab41880b5a2 (image_spec_1.2)
Author: Sebastiaan van Stijn <github@gone.nl>
Date:   Wed Aug 30 15:06:25 2023 +0200

    image/spec: rename v1.2.md to spec.md

    In preparation of merging the versioned-specs into a single file,
    with history.
...
...
commit 79910625f0a7aa76590e4362817dda22f28343aa
Author: Josh Hawn <josh.hawn@docker.com>
Date:   Sun Dec 7 23:25:31 2014 -0800

    Adds Docker Image v1 Spec Documention
...

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
image/spec: use permalink to versioned documents
32d5e63 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
image/spec: rename v1.0.md to spec.md
7ff3850 
In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
image/spec: rename v1.1.md to spec.md
c3f2bd1 
In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
image/spec: rename v1.2.md to spec.md
b8de6c0 
In preparation of merging the versioned-specs into a single file,
with history.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
merge image-spec v1.1 into specs.md
823d0b3 
This merges the v1.1 specs to provide a single history of the
specification.

To view the combined history:

    git log --follow image/spec/spec.md
@thaJeztah
merge image-spec v1.2 into specs.md
7aa0bc5 
This merges the v1.2 specs to provide a single history of the
specification.

To view the combined history:

    git log --follow image/spec/spec.md

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
image/spec: add back versioned files
d864d1e 
Add back files at the old locations, as there may be external links
referencing the specification.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 25.0.0 milestone Aug 30, 2023
@thaJeztah thaJeztah merged commit a74f1ab into moby:master Aug 30, 2023
@thaJeztah thaJeztah deleted the image_spec_combined branch August 30, 2023 15:56
This was referenced Aug 31, 2023
Merged
Merged
@thaJeztah thaJeztah mentioned this pull request Oct 15, 2024
Open
79 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rumpl rumpl rumpl approved these changes

Assignees
No one assigned
Labels
area/docs area/images Image Distribution status/3-docs-review
Projects
None yet
Milestone
25.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@thaJeztah @rumpl
0