Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Add LICENSE (copy of docker/docker's Apache-2.0 file)#103

Merged
thaJeztah merged 1 commit intodocker-archive:masterfrom
tianon:license
Jun 8, 2020
Merged

Add LICENSE (copy of docker/docker's Apache-2.0 file)#103
thaJeztah merged 1 commit intodocker-archive:masterfrom
tianon:license

Conversation

@tianon
Copy link
Copy Markdown
Contributor

@tianon tianon commented Jul 7, 2017

This repository was missing a license, but since it's been created mostly from bits of github.com/docker/docker, I figured that license was probably appropriate for this top-level (since the individual vendored directories should have their LICENSE files intact anyhow).

A quick diff to show that it's 100% identical:

$ diff -u \
  <(curl -fsSL 'https://github.com/docker/docker/raw/master/LICENSE') \
  <(curl -fsSL 'https://github.com/tianon/docker-ce/raw/license/LICENSE')
$ 

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

ping @andrewhsu @friism

@thaJeztah
Copy link
Copy Markdown
Member

Interesting;

17:46:12 [init] Removing components/engine/docs/reference/commandline/export.md
17:46:12 [init] Removing components/engine/docs/reference/commandline/exec.md
17:46:12 [init] Removing components/engine/docs/reference/commandline/events.md
17:46:12 [init] CONFLICT (modify/delete): components/engine/docs/reference/commandline/dockerd.md deleted in origin/pr/103 and modified in HEAD. Version HEAD of components/engine/docs/reference/commandline/dockerd.md left in tree.
17:46:12 [init] Removing components/engine/docs/reference/commandline/diff.md
17:46:12 [init] Removing components/engine/docs/reference/commandline/deploy.md
17:46:12 [init] Removing components/engine/docs/reference/commandline/create.md

@andrewhsu this also needs to go into the 17.06.x branch

@andrewhsu andrewhsu requested a review from friism August 31, 2017 00:23
@friism
Copy link
Copy Markdown
Contributor

friism commented Oct 10, 2017

Reposting my response from packaging issue:

Thanks for sending this PR. I don't think we should add a permissive license to this repo, however. The code in this repo is meant for the sole use of Docker Inc. to build packages for the Docker Community Edition products.

If this code had a permissive license, that might be misunderstood to mean that it's ok for others to build and distribute "Docker" packages (it's not ok, "Docker" is protected by a trademark owned by Docker Inc.).

Anyone interested in building something out of the open source components that go into Docker should use the Moby project, not this code: https://github.com/moby/moby

This packaging code is made available to provide transparency for Docker CE users, and to help them troubleshoot and report issues with Docker CE packages.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Oct 10, 2017

If this code had a permissive license, that might be misunderstood to mean that it's ok for others to build and distribute "Docker" packages (it's not ok, "Docker" is protected by a trademark owned by Docker Inc.).

Isn't that what this item in the license is included for?

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

Wondering though, given that some components are taken from other repositories,
that are Apache licenced;

You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

...

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

Reading that, does that imply that any file that has been modified (due to
cherry-picks/backports in this repository) must carry a comment stating what's
modified?

@Random-Liu
Copy link
Copy Markdown

Do we have a timeline for this? When are we going to have a LICENSE for docker-ce?

@StefanScherer
Copy link
Copy Markdown
Contributor

The Windows community is blocked having no newer Docker CLI binary than 17.10 available for months. The chocolatey package "docker" using direct downloads from download.docker.com/win/static suffers from it. People ask me to update, but I cannot help.

There are people with enterprise Windows machines using other Hypervisors than VirtualBox (Docker Toolbox) and Hyper-V (Docker 4 Windows). Installing Toolbox where you only need the Docker CLI is a big overhead.

I looked for a way to compile docker.exe for a specific release version, but it's not possible to share such binary. The docker/cli repo has no tags and branches, so it's unusable. Only source of truth is this repo's components/cli subfolder. But without a license it's impossible to distribute such binary for the Chocolatey community.

@thaJeztah
Copy link
Copy Markdown
Member

There’s a license inside the components/cli directory, so I wonder if that’s enough to build just the cli.

docker-jenkins pushed a commit that referenced this pull request Apr 10, 2018
Bump Golang to 1.9.5
Upstream-commit: f169b1e
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 15, 2018
[18.09 backport] Fix double "unix://" scheme in TestInfoAPIWarnings
Upstream-commit: 299385de7fb930e7e805faf960dc66e9cadd8ad4
Component: engine
@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Apr 10, 2019

Any chance of this being revisited?

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Bump Golang to 1.9.5
Upstream-commit: f169b1e
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
StefanScherer
StefanScherer previously approved these changes Mar 11, 2020
Copy link
Copy Markdown
Contributor

@StefanScherer StefanScherer left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

wait with merging of this one; I got approval for the docker/docker-ce-packaging repo, but this one was not yet discussed

(FWIW, we're moving away from using this mono-repo in our build/packaging pipelines, so it will be obsolete in the near future)

@StefanScherer StefanScherer dismissed their stale review March 11, 2020 11:58

Approval should be done in docker/docker-ce-packaging

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

let's bring this one in; ignoring CI as the Jenkins config was moved, and CI is not testing this, other than a DCO check, and the commit has a DCO sign-off

@thaJeztah thaJeztah merged commit d37ff93 into docker-archive:master Jun 8, 2020
@tianon tianon deleted the license branch June 8, 2020 14:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants