Skip to content

Commit

Permalink
replaced docker/docker with moby/moby (docker#2879)
Browse files Browse the repository at this point in the history
* replaced docker/docker with moby/moby

* fixed incorrect name changes in release notes

* fixed mentions of moby/moby in code
  • Loading branch information
noncreature0714 authored and Misty Stanley-Jones committed Apr 20, 2017
1 parent d4047a2 commit a3a7ae1
Show file tree
Hide file tree
Showing 382 changed files with 482 additions and 482 deletions.
2 changes: 1 addition & 1 deletion 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ if (gonnaFwd) {
console.log("Showing 404 choices");
var ghIssueQueryString = "title=404%20at%20" + path + "&body=URL%3A%20" + path;
var output = new Array();
output.push("<ul><li><a href='https://github.com/docker/docker.github.io/issues/new?" + ghIssueQueryString + "' class='nomunge'>File a ticket</a></li>");
output.push("<ul><li><a href='https://github.com/moby/moby.github.io/issues/new?" + ghIssueQueryString + "' class='nomunge'>File a ticket</a></li>");
output.push("<li><a href='/search/?q=" + phrase + "'</a>Search for <tt>&quot;" + phrase + "&quot;</tt></a></li>");
output.push("<li><a href='/search/'>Try a different search</a></li>");
output.push("<li><a href='/'>Go to the index</a></li></ul>");
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,31 +59,31 @@ work will be visible on docs.docker.com.

The following `vnext` branches currently exist:

- **[vnext-engine](https://github.com/docker/docker.github.io/tree/vnext-engine):**
docs for upcoming features in the [docker/docker](https://github.com/docker/docker/)
- **[vnext-engine](https://github.com/moby/moby.github.io/tree/vnext-engine):**
docs for upcoming features in the [docker/docker](https://github.com/moby/moby/)
project

- **[vnext-compose](https://github.com/docker/docker.github.io/tree/vnext-compose):**
- **[vnext-compose](https://github.com/moby/moby.github.io/tree/vnext-compose):**
docs for upcoming features in the [docker/compose](https://github.com/docker/compose/)
project

- **[vnext-distribution](https://github.com/docker/docker.github.io/tree/vnext-distribution):**
- **[vnext-distribution](https://github.com/moby/moby.github.io/tree/vnext-distribution):**
docs for upcoming features in the [docker/distribution](https://github.com/docker/distribution/)
project

- **[vnext-opensource](https://github.com/docker/docker.github.io/tree/vnext-opensource):**
- **[vnext-opensource](https://github.com/moby/moby.github.io/tree/vnext-opensource):**
docs for upcoming features in the [docker/opensource](https://github.com/docker/opensource/)
project

- **[vnext-swarm](https://github.com/docker/docker.github.io/tree/vnext-swarm):**
- **[vnext-swarm](https://github.com/moby/moby.github.io/tree/vnext-swarm):**
docs for upcoming features in the [docker/swarm](https://github.com/docker/swarm/)
project

- **[vnext-toolbox](https://github.com/docker/docker.github.io/tree/vnext-toolbox):**
- **[vnext-toolbox](https://github.com/moby/moby.github.io/tree/vnext-toolbox):**
docs for upcoming features in the [docker/toolbox](https://github.com/docker/toolbox/)
project

- **[vnext-kitematic](https://github.com/docker/docker.github.io/tree/vnext-kitematic):**
- **[vnext-kitematic](https://github.com/moby/moby.github.io/tree/vnext-kitematic):**
docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/)
project

Expand Down
2 changes: 1 addition & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ reference we imported, and its tag if relevant.
| https://github.com/docker/opensource | b9b87bed67f4289 | docs-2016-08-03 |
| https://github.com/docker/kitematic | 02c9f9607128802 | v0.12.0 |
| https://github.com/docker/machine | 95041b4cfe2e8b2 | docs-v0.8.2-2016-09-28 |
| https://github.com/docker/docker | 3134c23b55eb100 | n/a |
| https://github.com/moby/moby | 3134c23b55eb100 | n/a |
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ work will be visible on [https://docs.docker.com/](https://docs.docker.com/).

The following `vnext` branches currently exist:

- **[vnext-engine](https://github.com/docker/docker.github.io/tree/vnext-engine):**
docs for upcoming features in the [docker/docker](https://github.com/docker/docker/)
- **[vnext-engine](https://github.com/moby/moby.github.io/tree/vnext-engine):**
docs for upcoming features in the [docker/docker](https://github.com/moby/moby/)
project

- **[vnext-compose](https://github.com/docker/docker.github.io/tree/vnext-compose):**
- **[vnext-compose](https://github.com/moby/moby.github.io/tree/vnext-compose):**
docs for upcoming features in the [docker/compose](https://github.com/docker/compose/)
project

- **[vnext-distribution](https://github.com/docker/docker.github.io/tree/vnext-distribution):**
- **[vnext-distribution](https://github.com/moby/moby.github.io/tree/vnext-distribution):**
docs for upcoming features in the [docker/distribution](https://github.com/docker/distribution/)
project

- **[vnext-swarm](https://github.com/docker/docker.github.io/tree/vnext-swarm):**
- **[vnext-swarm](https://github.com/moby/moby.github.io/tree/vnext-swarm):**
docs for upcoming features in the [docker/swarm](https://github.com/docker/swarm/)
project

- **[vnext-toolbox](https://github.com/docker/docker.github.io/tree/vnext-toolbox):**
- **[vnext-toolbox](https://github.com/moby/moby.github.io/tree/vnext-toolbox):**
docs for upcoming features in the [docker/toolbox](https://github.com/docker/toolbox/)
project

Expand All @@ -111,7 +111,7 @@ You have three options:
1. On your local machine, clone this repo and run our staging container:

```bash
git clone https://github.com/docker/docker.github.io.git
git clone https://github.com/moby/moby.github.io.git
cd docker.github.io
docker-compose up
```
Expand All @@ -134,7 +134,7 @@ You have three options:
a. Clone this repo by running:
```bash
git clone https://github.com/docker/docker.github.io.git
git clone https://github.com/moby/moby.github.io.git
```
b. Install Ruby 2.3 or later as described in [Installing Ruby]
Expand Down
2 changes: 1 addition & 1 deletion _includes/github-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
If you omit the pr, it defaults to NULL.

Output:
[#12345](https://github.com/docker/docker/pull/12345)
[#12345](https://github.com/moby/moby/pull/12345)
{% endcomment %}{% assign org = include.org | default: "docker" %}{% assign repo = include.repo | default: "docker" %}{% assign pr = include.pr | default: NULL %}{% assign github-url="https://github.com" %}{% capture pr-link %}[#{{ pr }}]({{ github-url }}/{{ org }}/{{ repo }}/pull/{{ pr }}){% endcapture %}{{ pr-link | strip_newlines }}
6 changes: 3 additions & 3 deletions _layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Logic for feedback CC'ing -->
{% if page.assignee %}{% assign assignee=page.assignee%}{% else %}{% assign assignee=page.defaultassignee%}{% endif %}
<!-- Logic for 'edit this button' -->
{% assign edit_url = "https://github.com/docker/docker.github.io/edit/master/" | append: page.path %} {% for entry in site.data.not_edited_here.overrides %} {% if page.url contains entry.path %} {% if entry.source %}{% assign edit_url = entry.source %}{%
{% assign edit_url = "https://github.com/moby/moby.github.io/edit/master/" | append: page.path %} {% for entry in site.data.not_edited_here.overrides %} {% if page.url contains entry.path %} {% if entry.source %}{% assign edit_url = entry.source %}{%
else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %}

<!-- End of logic for 'edit this button' -->
Expand Down Expand Up @@ -128,7 +128,7 @@ <h1>{{ page.title }}</h1>{% endif %} {% if page.advisory %}
"id": "8453675",
"unique_id": "{{ page.path }}",
"title": "{{ page.title }}",
"permalink": "https://github.com/docker/docker.github.io/blob/master/{{ page.path }}"
"permalink": "https://github.com/moby/moby.github.io/blob/master/{{ page.path }}"
};
(function(d, c, j) {
if (!document.getElementById(j)) {
Expand Down Expand Up @@ -157,7 +157,7 @@ <h1>{{ page.title }}</h1>{% endif %} {% if page.advisory %}
<ul>
{% if edit_url != "" %}
<li><a href="{{ edit_url }}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit this page</a></li>{% endif %}
<li><a href="https://github.com/docker/docker.github.io/issues/new?assignee={% if page.assignee %}{{ page.assignee }}{% else %}{{ page.defaultassignee }}{% endif %}&body=File: [{{ page.path }}](https://docs.docker.com{{ page.url }}), CC @{{ assignee }}"
<li><a href="https://github.com/moby/moby.github.io/issues/new?assignee={% if page.assignee %}{{ page.assignee }}{% else %}{{ page.defaultassignee }}{% endif %}&body=File: [{{ page.path }}](https://docs.docker.com{{ page.url }}), CC @{{ assignee }}"
class="nomunge"><i class="fa fa-check" aria-hidden="true"></i> Request docs changes</a></li>
<li><a href="https://www.docker.com/docker-support-services"><i class="fa fa-question" aria-hidden="true"></i> Get support</a></li>
<!-- toggle mode -->
Expand Down
24 changes: 12 additions & 12 deletions _scripts/fetch-upstream-resources.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Fetches upstream resources from docker/docker and docker/distribution
# Fetches upstream resources from moby/moby and docker/distribution
# before handing off the site to Jekyll to build
# Relies on the following environment variables which are usually set by
# the Dockerfile. Uncomment them here to override for debugging
Expand All @@ -14,30 +14,30 @@ DISTRIBUTION_SVN_BRANCH="branches/release/2.6"
DISTRIBUTION_BRANCH="release/2.6"

# Directories to get via SVN. We use this because you can't use git to clone just a portion of a repository
svn co https://github.com/docker/docker/"$ENGINE_SVN_BRANCH"/docs/extend md_source/engine/extend || (echo "Failed engine/extend download" && exit -1)
svn co https://github.com/docker/docker/"$ENGINE_SVN_BRANCH"/docs/api md_source/engine/api || (echo "Failed engine/api download" && exit -1) # This will only get you the old API MD files 1.18 through 1.24
svn co https://github.com/moby/moby/"$ENGINE_SVN_BRANCH"/docs/extend md_source/engine/extend || (echo "Failed engine/extend download" && exit -1)
svn co https://github.com/moby/moby/"$ENGINE_SVN_BRANCH"/docs/api md_source/engine/api || (echo "Failed engine/api download" && exit -1) # This will only get you the old API MD files 1.18 through 1.24
svn co https://github.com/docker/distribution/"$DISTRIBUTION_SVN_BRANCH"/docs/spec md_source/registry/spec || (echo "Failed registry/spec download" && exit -1)


# Get the Engine APIs that are in Swagger
# Be careful with the locations on Github for these
wget -O md_source/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/v1.13.0/api/swagger.yaml || (echo "Failed 1.25 swagger download" && exit -1)
wget -O md_source/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.0-ce/api/swagger.yaml || (echo "Failed 1.26 swagger download" && exit -1)
wget -O md_source/engine/api/v1.27/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.1-ce/api/swagger.yaml || (echo "Failed 1.27 swagger download" && exit -1)
wget -O md_source/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/moby/moby/v1.13.0/api/swagger.yaml || (echo "Failed 1.25 swagger download" && exit -1)
wget -O md_source/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/moby/moby/v17.03.0-ce/api/swagger.yaml || (echo "Failed 1.26 swagger download" && exit -1)
wget -O md_source/engine/api/v1.27/swagger.yaml https://raw.githubusercontent.com/moby/moby/v17.03.1-ce/api/swagger.yaml || (echo "Failed 1.27 swagger download" && exit -1)

# Get the Edge API Swagger (we only keep the latest one of these
# When you change this you need to make sure to copy the previous
# directory into a new one in the docs git and change the index.html
wget -O md_source/engine/api/v1.28/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.04.0-ce/api/swagger.yaml || (echo "Failed 1.28 swagger download or the 1.28 directory doesn't exist" && exit -1)
wget -O md_source/engine/api/v1.28/swagger.yaml https://raw.githubusercontent.com/moby/moby/v17.04.0-ce/api/swagger.yaml || (echo "Failed 1.28 swagger download or the 1.28 directory doesn't exist" && exit -1)

# Get a few one-off files that we use directly from upstream
wget -O md_source/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker/"$ENGINE_BRANCH"/docs/reference/builder.md || (echo "Failed engine/reference/builder.md download" && exit -1)
wget -O md_source/engine/reference/run.md https://raw.githubusercontent.com/docker/docker/"$ENGINE_BRANCH"/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1)
wget -O md_source/engine/reference/commandline/cli.md https://raw.githubusercontent.com/docker/docker/"$ENGINE_BRANCH"/docs/reference/commandline/cli.md || (echo "Failed engine/reference/commandline/cli.md download" && exit -1)
wget -O md_source/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/"$ENGINE_BRANCH"/docs/deprecated.md || (echo "Failed engine/deprecated.md download" && exit -1)
wget -O md_source/engine/reference/builder.md https://raw.githubusercontent.com/moby/moby/"$ENGINE_BRANCH"/docs/reference/builder.md || (echo "Failed engine/reference/builder.md download" && exit -1)
wget -O md_source/engine/reference/run.md https://raw.githubusercontent.com/moby/moby/"$ENGINE_BRANCH"/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1)
wget -O md_source/engine/reference/commandline/cli.md https://raw.githubusercontent.com/moby/moby/"$ENGINE_BRANCH"/docs/reference/commandline/cli.md || (echo "Failed engine/reference/commandline/cli.md download" && exit -1)
wget -O md_source/engine/deprecated.md https://raw.githubusercontent.com/moby/moby/"$ENGINE_BRANCH"/docs/deprecated.md || (echo "Failed engine/deprecated.md download" && exit -1)
wget -O md_source/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/"$DISTRIBUTION_BRANCH"/docs/configuration.md || (echo "Failed registry/configuration.md download" && exit -1)

# Remove things we don't want in the build
rm md_source/registry/spec/api.md.tmpl
rm -rf md_source/apidocs/cloud-api-source
rm -rf md_source/tests
rm -rf md_source/tests
2 changes: 1 addition & 1 deletion apidocs/cloud-api-source/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ If you find a typo or mismatch between the API and this documentation, please se
To run it locally:

```none
$ git clone https://github.com/docker/docker.github.io.git
$ git clone https://github.com/moby/moby.github.io.git
$ make release
```

Expand Down
4 changes: 2 additions & 2 deletions apidocs/cloud-api-source/source/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ search: true

# Introduction

Docker Cloud currently offers a **HTTP REST API** and a **Websocket Stream API** which are used by both the [Web UI](https://cloud.docker.com/) and the [CLI](https://github.com/docker/dockercloud-cli). This API documentation contains all API operations currently supported in the platform and provides examples of how to execute them using our Command Line Interface (CLI), [Python SDK](https://github.com/docker/python-dockercloud) and [Go SDK](https://github.com/docker/go-dockercloud).
Docker Cloud currently offers a **HTTP REST API** and a **Websocket Stream API** which are used by both the [Web UI](https://cloud.docker.com/) and the [CLI](https://github.com/moby/mobycloud-cli). This API documentation contains all API operations currently supported in the platform and provides examples of how to execute them using our Command Line Interface (CLI), [Python SDK](https://github.com/docker/python-dockercloud) and [Go SDK](https://github.com/docker/go-dockercloud).

# Authentication

Expand Down Expand Up @@ -102,7 +102,7 @@ Examples:
If you are using namespaces with the `docker-cloud` CLI, set them by changing
the value of the `DOCKERCLOUD_NAMESPACE` environment variable. You can either
set this globally, or specify it before each CLI command. To learn more, see the
[Docker Cloud CLI README](https://github.com/docker/dockercloud-cli#namespace).
[Docker Cloud CLI README](https://github.com/moby/mobycloud-cli#namespace).

## Stream API

Expand Down
6 changes: 3 additions & 3 deletions compose/bundles.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ title: Docker stacks and distributed application bundles (experimental)
---

> **Note**: This is a modified copy of the [Docker Stacks and Distributed Application
> Bundles](https://github.com/docker/docker/blob/v1.12.0-rc4/experimental/docker-stacks-and-bundles.md)
> document in the [docker/docker repo](https://github.com/docker/docker). It's been updated to accurately reflect newer releases.
> Bundles](https://github.com/moby/moby/blob/v1.12.0-rc4/experimental/docker-stacks-and-bundles.md)
> document in the [docker/docker repo](https://github.com/moby/moby). It's been updated to accurately reflect newer releases.
## Overview

Expand Down Expand Up @@ -59,7 +59,7 @@ Wrote bundle to vossibility-stack.dab
> [Docker for Mac](/docker-for-mac/) or
> [Docker for Windows](/docker-for-windows/) to install
> it. If you're on Linux, follow the instructions in the
> [experimental build README](https://github.com/docker/docker/blob/master/experimental/README.md).
> [experimental build README](https://github.com/moby/moby/blob/master/experimental/README.md).
A stack is created using the `docker deploy` command:

Expand Down
16 changes: 8 additions & 8 deletions cs-engine/1.12/release-notes/prior-release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ title: Release notes archive for Commercially Supported Docker Engine.
This document contains the previous versions of the commercially supported
Docker Engine release notes. It includes issues, fixes, and new features.

Refer to the [detailed list](https://github.com/docker/docker/releases) of all changes since the release of CS Engine 1.10.3-cs3
Refer to the [detailed list](https://github.com/moby/moby/releases) of all changes since the release of CS Engine 1.10.3-cs3

## CS Engine 1.10.3-cs4
(12 Jan 2017)
Expand All @@ -27,22 +27,22 @@ A vulnerability in the Go standard runtime libraries allowed a maliciously craft

This issue is resolved by using Go runtime v1.5.4 which was released to address this vulnerability

* https://github.com/docker/docker/pull/21977
* https://github.com/docker/docker/pull/21987
* https://github.com/moby/moby/pull/21977
* https://github.com/moby/moby/pull/21987

## CS Engine 1.10.3-cs2
(18 March 2016)

Bug fix release picking up changes from Docker 1.10.3 release.

Refer to the [detailed list](https://github.com/docker/docker/releases/tag/v1.10.3) of all changes since the release of CS Engine 1.10.2-cs1
Refer to the [detailed list](https://github.com/moby/moby/releases/tag/v1.10.3) of all changes since the release of CS Engine 1.10.2-cs1

## CS Engine 1.10.2-cs1
(22 February 2016)

In this release the CS Engine is supported on SUSE Linux Enterprise 12 OS.

Refer to the [detailed list](https://github.com/docker/docker/releases) of all changes since the release of CS Engine 1.9.1.
Refer to the [detailed list](https://github.com/moby/moby/releases) of all changes since the release of CS Engine 1.9.1.

## CS Engine 1.9.1-cs3
(6 January 2016)
Expand Down Expand Up @@ -75,7 +75,7 @@ Starting with this release, upgrading minor versions, for example, from 1.9.0 to

You can refer to the detailed list of all changes since the release of CS Engine
1.9.0
https://github.com/docker/docker/releases.
https://github.com/moby/moby/releases.

## CS Engine 1.9.0
(12 November 2015)
Expand Down Expand Up @@ -105,14 +105,14 @@ source with three releases under support at one time. This means you’ll be abl
to take advantage of the latest and greatest features and you won’t have to wait
for a supported release to take advantage of a specific feature.

Refer to the [detailed list](https://github.com/docker/docker/releases) of all changes since the release of CS Engine 1.6.
Refer to the [detailed list](https://github.com/moby/moby/releases) of all changes since the release of CS Engine 1.6.

## CS Engine 1.6.2-cs7
(12 October 2015)

As part of our ongoing security efforts, <a href="http://blog.docker.com/2015/10/security-release-docker-1-8-3-1-6-2-cs7" target="_blank">a vulnerability was discovered</a> that affects the way content
is stored and retrieved within the Docker Engine and CS Docker Engine. Today we
are releasing a security update that fixes this issue in both Docker Engine 1.8.3 and CS Docker Engine 1.6.2-cs7. The <a href="https://github.com/docker/docker/blob/master/CHANGELOG.md#161-2015-10-12" target="_blank">change log for Docker Engine 1.8.3</a> has a complete list of all the changes incorporated into both the open source and commercially
are releasing a security update that fixes this issue in both Docker Engine 1.8.3 and CS Docker Engine 1.6.2-cs7. The <a href="https://github.com/moby/moby/blob/master/CHANGELOG.md#161-2015-10-12" target="_blank">change log for Docker Engine 1.8.3</a> has a complete list of all the changes incorporated into both the open source and commercially
supported releases.

We recommend that users upgrade to CS Docker Engine 1.6.2-cs7. If you are unable
Expand Down
Loading

0 comments on commit a3a7ae1

Please sign in to comment.