Skip to content

Commit

Permalink
Carry of PR moby#13520
Browse files Browse the repository at this point in the history
Removinig files

Signed-off-by: Mary Anthony <[email protected]>
  • Loading branch information
Mary Anthony committed Jun 13, 2015
1 parent 261af00 commit cd44018
Show file tree
Hide file tree
Showing 46 changed files with 77 additions and 76 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- Prohibit mount of /sys

#### Runtime
- Update Apparmor policy to not allow mounts
- Update AppArmor policy to not allow mounts

## 1.6.0 (2015-04-07)

Expand Down Expand Up @@ -309,7 +309,7 @@

#### Hack
* Clean up "go test" output from "make test" to be much more readable/scannable.
* Excluse more "definitely not unit tested Go source code" directories from hack/make/test.
* Exclude more "definitely not unit tested Go source code" directories from hack/make/test.
+ Generate md5 and sha256 hashes when building, and upload them via hack/release.sh.
- Include contributed completions in Ubuntu PPA.
+ Add cli integration tests.
Expand Down Expand Up @@ -589,7 +589,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
* The ADD instruction now supports caching, which avoids unnecessarily re-uploading the same source content again and again when it hasn’t changed
* The new ONBUILD instruction adds to your image a “trigger” instruction to be executed at a later time, when the image is used as the base for another build
* Docker now ships with an experimental storage driver which uses the BTRFS filesystem for copy-on-write
* Docker is officially supported on Mac OSX
* Docker is officially supported on Mac OS X
* The Docker daemon supports systemd socket activation

## 0.7.6 (2014-01-14)
Expand Down Expand Up @@ -643,12 +643,12 @@ With the ongoing changes to the networking and execution subsystems of docker te
- Fix ADD caching issue with . prefixed path
- Fix docker build on devicemapper by reverting sparse file tar option
- Fix issue with file caching and prevent wrong cache hit
* Use same error handling while unmarshalling CMD and ENTRYPOINT
* Use same error handling while unmarshalling CMD and ENTRYPOINT

#### Documentation

* Simplify and streamline Amazon Quickstart
* Install instructions use unprefixed fedora image
* Install instructions use unprefixed Fedora image
* Update instructions for mtu flag for Docker on GCE
+ Add Ubuntu Saucy to installation
- Fix for wrong version warning on master instead of latest
Expand Down Expand Up @@ -823,7 +823,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
* Improve unit tests
* The test suite now runs all tests even if one fails
* Refactor C in Go (Devmapper)
- Fix OSX compilation
- Fix OS X compilation

## 0.7.0 (2013-11-25)

Expand All @@ -841,7 +841,7 @@ With the ongoing changes to the networking and execution subsystems of docker te

#### Runtime

* Improve stability, fixes some race conditons
* Improve stability, fixes some race conditions
* Skip the volumes mounted when deleting the volumes of container.
* Fix layer size computation: handle hard links correctly
* Use the work Path for docker cp CONTAINER:PATH
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ set of patches that should be reviewed together: for example, upgrading the
version of a vendored dependency and taking advantage of its now available new
feature constitute two separate units of work. Implementing a new function and
calling it in another file constitute a single logical unit of work. The very
high majory of submissions should have a single commit, so if in doubt: squash
high majority of submissions should have a single commit, so if in doubt: squash
down to one.

After every commit, [make sure the test suite passes]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# -e GPG_PASSPHRASE=gloubiboulga \
# docker hack/release.sh
#
# Note: Apparmor used to mess with privileged mode, but this is no longer
# Note: AppArmor used to mess with privileged mode, but this is no longer
# the case. Therefore, you don't have to disable it anymore.
#

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ [email protected] and not by creating a github issue.

A common method for distributing applications and sandboxing their
execution is to use virtual machines, or VMs. Typical VM formats are
VMware's vmdk, Oracle Virtualbox's vdi, and Amazon EC2's ami. In theory
VMWare's vmdk, Oracle VirtualBox's vdi, and Amazon EC2's ami. In theory
these formats should allow every developer to automatically package
their application into a "machine" for easy distribution and deployment.
In practice, that almost never happens, for a few reasons:
Expand Down
2 changes: 1 addition & 1 deletion builder/parser/testfiles/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# -e GPG_PASSPHRASE=gloubiboulga \
# docker hack/release.sh
#
# Note: Apparmor used to mess with privileged mode, but this is no longer
# Note: AppArmor used to mess with privileged mode, but this is no longer
# the case. Therefore, you don't have to disable it anymore.
#

Expand Down
8 changes: 4 additions & 4 deletions contrib/syntax/textmate/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Docker.tmbundle

Dockerfile syntaxt highlighting for TextMate and Sublime Text.
Dockerfile syntax highlighting for TextMate and Sublime Text.

## Install

### Sublime Text

Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting).
Available for Sublime Text under [Package Control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting).
Search for *Dockerfile Syntax Highlighting*

### TextMate 2

Copy the directory `Docker.tmbundle` (showed as a Package in OSX) to `~/Library/Application Support/TextMate/Managed/Bundles`
Copy the directory `Docker.tmbundle` (shown as a Package in OS X) to `~/Library/Application Support/TextMate/Managed/Bundles`

enjoy.
Enjoy.
2 changes: 1 addition & 1 deletion daemon/graphdriver/devmapper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Here is the list of supported options:
device. And devices automatically goes away when last user of device
exits.

For example, when contianer exits, its associated thin device is
For example, when container exits, its associated thin device is
removed. If that devices has leaked into some other mount namespace
can can't be removed now, container exit will still be successful
and this option will just schedule device for deferred removal and
Expand Down
1 change: 1 addition & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,4 @@ project.




2 changes: 1 addition & 1 deletion docs/sources/articles/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Docker containers are, by default, quite secure; especially if you take
care of running your processes inside the containers as non-privileged
users (i.e., non-`root`).

You can add an extra layer of safety by enabling Apparmor, SELinux,
You can add an extra layer of safety by enabling AppArmor, SELinux,
GRSEC, or your favorite hardening solution.

Last but not least, if you see interesting security features in other
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/docker-hub-enterprise/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ page_keywords: docker, documentation, about, technology, understanding, enterpri
### CS Docker Engine 1.6.2-cs5
(21 May 2015)

For customers running Docker Engine on [supported versions of RedHat Enterprise
Linux](https://www.docker.com/enterprise/support/) with [SELinux
For customers running Docker Engine on [supported versions of Red Hat Enterprise
Linux (RHEL)](https://www.docker.com/enterprise/support/) with [SELinux
enabled](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/
6/html/Security-Enhanced_Linux/sect-Security-Enhanced_Linux-Working_with_SELinux
-Enabling_and_Disabling_SELinux.html), the `docker build` and `docker run`
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/docker-hub/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Follow the steps below to configure the GitHub Service hooks for your Automated
<tr>
<td>1.</td>
<td><img src="/docker-hub/hub-images/gh_settings.png"></td>
<td>Log in to Github.com, and go to your Repository page. Click on "Settings" on
<td>Log in to GitHub.com, and go to your Repository page. Click on "Settings" on
the right side of the page. You must have admin privileges to the repository in order to do this.</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/installation/binaries.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ To set the file's execute bit on Linux and OS X:

$ chmod +x docker

To get the list of stable release version numbers from Github, view the
To get the list of stable release version numbers from GitHub, view the
`docker/docker` [releases page](https://github.com/docker/docker/releases).

> **Note**
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/installation/mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Use `boot2docker help` to list the full command line reference. For more
information about using SSH or SCP to access the Boot2Docker VM, see the README
at [Boot2Docker repository](https://github.com/boot2docker/boot2docker).

Thanks to Chris Jones whose [blog](http://goo.gl/Be6cCk) inspired me to redo
this page.
Thanks to Chris Jones whose [blog](http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide)
inspired me to redo this page.

Continue with the [Docker User Guide](/userguide/).
2 changes: 1 addition & 1 deletion docs/sources/installation/softlayer.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
page_title: Installation on IBM SoftLayer
page_description: Installation instructions for Docker on IBM Softlayer.
page_description: Installation instructions for Docker on IBM SoftLayer.
page_keywords: IBM SoftLayer, virtualization, cloud, docker, documentation, installation

# IBM SoftLayer
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/installation/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ to you using:

boot2docker ip

Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP
Typically, it is 192.168.59.103, but it could get changed by VirtualBox's DHCP
implementation.

For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io)
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/project/advanced-contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,6 @@ Making a pull request with a design proposal simplifies this process:
* you can leave comments on specific design proposal line
* replies around line are easy to track
* as a proposal changes and is updated, pages reset as line items resolve
* Github maintains the entire history
* GitHub maintains the entire history

While proposals in pull requests do not end up merged into a master repository, they provide a convenient tool for managing the design process.
2 changes: 1 addition & 1 deletion docs/sources/project/doc-style.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Text taken from a GUI (e.g., menu text or button text) should appear in "double
quotes". The text should take the exact same capitalisation, etc. as appears in
the GUI. E.g., Click "Continue" to save the settings.

Text that refers to a keyboard command or hotkey is capitalized (e.g., Ctrl-D).
Text that refers to a keyboard command or hotkey is capitalized (e.g., Ctrl-D).

When writing CLI examples, give the user hints by making the examples resemble
exactly what they see in their shell:
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/project/set-up-git.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ the branch to your fork on GitHub:
* [new branch] dry-run-test -> dry-run-test
Branch dry-run-test set up to track remote branch dry-run-test from origin.

9. Open your browser to Github.
9. Open your browser to GitHub.

10. Navigate to your Docker fork.

Expand Down
4 changes: 2 additions & 2 deletions docs/sources/project/software-req-win.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ In this section, you install the Go language. Then, you build the source so that

## Get the Docker repository

In this step, you start a Git `bash` terminal and get the Docker source code from
Github.
In this step, you start a Git `bash` terminal and get the Docker source code
from GitHub.

1. Locate the **Git Bash** program and start it.

Expand Down
4 changes: 2 additions & 2 deletions docs/sources/reference/api/docker_remote_api_v1.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Status Codes:
"Warnings":[]
}

**Second, start (using the ID returned above) the image we jus
**Second, start (using the ID returned above) the image we just
created, mapping the ssh port 22 to something on the host**:

POST /containers/e90e34656806/start HTTP/1.1
Expand All @@ -190,7 +190,7 @@ Status Codes:

**Example response**:

HTTP/1.1 204 No Conten
HTTP/1.1 204 No Content
Content-Type: text/plain; charset=utf-8
Content-Length: 0

Expand Down
14 changes: 7 additions & 7 deletions docs/sources/reference/commandline/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -698,13 +698,13 @@ to any of the files in the context. For example, your build can use an
[*ADD*](/reference/builder/#add) instruction to reference a file in the
context.

The `URL` parameter can specify the location of a Git repository; the
repository acts as the build context. The system recursively clones the
repository and its submodules using a `git clone --depth 1 --recursive`
command. This command runs in a temporary directory on your local host. After
the command succeeds, the directory is sent to the Docker daemon as the
context. Local clones give you the ability to access private repositories using
local user credentials, VPN's, and so forth.
The `URL` parameter can specify the location of a Git repository; the repository
acts as the build context. The system recursively clones the repository and its
submodules using a `git clone --depth 1 --recursive` command. This command runs
in a temporary directory on your local host. After the command succeeds, the
directory is sent to the Docker daemon as the context. Local clones give you the
ability to access private repositories using local user credentials, VPNs, and
so forth.

Git URLs accept context configuration in their fragment section, separated by a
colon `:`. The first part represents the reference that Git will check out,
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/reference/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Docker and its components. It provides the following services:
- Docker image hosting
- User authentication
- Automated image builds and work-flow tools such as build triggers and web hooks
- Integration with GitHub and BitBucket
- Integration with GitHub and Bitbucket


## Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repository](https://github.com/docker/docker/issues/).
An idiosyncrasy in AUFS prevented permissions from propagating predictably
between upper and lower layers. This caused issues with accessing private
keys, database instances, etc. This issue was closed in this release:
[Github Issue 783](https://github.com/docker/docker/issues/783).
[GitHub Issue 783](https://github.com/docker/docker/issues/783).


* *Docker Hub incompatible with Safari 8*
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/userguide/dockerhub.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ most out of Docker. To do this, it provides services such as:
* User authentication.
* Automated image builds and work-flow tools such as build triggers and web
hooks.
* Integration with GitHub and BitBucket.
* Integration with GitHub and Bitbucket.

In order to use Docker Hub, you will first need to register and create an account. Don't
worry, creating an account is simple and free.
Expand Down
12 changes: 6 additions & 6 deletions docs/sources/userguide/dockerrepos.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,24 +118,24 @@ manage private repositories. You can learn how to create and manage an organizat
### Automated Builds

Automated Builds automate the building and updating of images from
[GitHub](https://www.github.com) or [BitBucket](http://bitbucket.com), directly on Docker
Hub. It works by adding a commit hook to your selected GitHub or BitBucket repository,
[GitHub](https://www.github.com) or [Bitbucket](http://bitbucket.com), directly on Docker
Hub. It works by adding a commit hook to your selected GitHub or Bitbucket repository,
triggering a build and update when you push a commit.

#### To setup an Automated Build

1. Create a [Docker Hub account](https://hub.docker.com/) and login.
2. Link your GitHub or BitBucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu.
2. Link your GitHub or Bitbucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu.
3. [Configure an Automated Build](https://registry.hub.docker.com/builds/add/).
4. Pick a GitHub or BitBucket project that has a `Dockerfile` that you want to build.
4. Pick a GitHub or Bitbucket project that has a `Dockerfile` that you want to build.
5. Pick the branch you want to build (the default is the `master` branch).
6. Give the Automated Build a name.
7. Assign an optional Docker tag to the Build.
8. Specify where the `Dockerfile` is located. The default is `/`.

Once the Automated Build is configured it will automatically trigger a
build and, in a few minutes, you should see your new Automated Build on the [Docker Hub](https://hub.docker.com)
Registry. It will stay in sync with your GitHub and BitBucket repository until you
Registry. It will stay in sync with your GitHub and Bitbucket repository until you
deactivate the Automated Build.

If you want to see the status of your Automated Builds, you can go to your
Expand All @@ -144,7 +144,7 @@ and it will show you the status of your builds and their build history.

Once you've created an Automated Build you can deactivate or delete it. You
cannot, however, push to an Automated Build with the `docker push` command.
You can only manage it by committing code to your GitHub or BitBucket
You can only manage it by committing code to your GitHub or Bitbucket
repository.

You can create multiple Automated Builds per repository and configure them
Expand Down
6 changes: 3 additions & 3 deletions docs/sources/userguide/dockervolumes.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ directory from your Docker daemon's host into a container.

> **Note:**
> If you are using Boot2Docker, your Docker daemon only has limited access to
> your OSX/Windows filesystem. Boot2Docker tries to auto-share your `/Users`
> (OSX) or `C:\Users` (Windows) directory - and so you can mount files or directories
> using `docker run -v /Users/<path>:/<container path> ...` (OSX) or
> your OS X/Windows filesystem. Boot2Docker tries to auto-share your `/Users`
> (OS X) or `C:\Users` (Windows) directory - and so you can mount files or directories
> using `docker run -v /Users/<path>:/<container path> ...` (OS X) or
> `docker run -v /c/Users/<path>:/<container path ...` (Windows). All other paths
> come from the Boot2Docker virtual machine's filesystem.
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/userguide/level2.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ RUN apt-get install -y <input id="gcc" class="l_fill" type="text"><br>
<input id="run6" class="l_fill" type="text">cd redis-stable && make && make install<br>
&#35; launch redis when starting the image
<input id="entrypoint" class="l_fill" type="text"> ["redis-server"]<br>
&#35; run as user dameon
&#35; run as user daemon
<input id="user" class="l_fill" type="text"> daemon<br>
&#35; expose port 6379
<input id="expose" class="l_fill" type="text"> 6379
Expand Down
2 changes: 1 addition & 1 deletion experimental/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This page contains a list of features in the Docker engine which are
experimental. Experimental features are **not** ready for production. They are
provided for test and evaluation in your sandbox environments.

The information below describes each feature and the Github pull requests and
The information below describes each feature and the GitHub pull requests and
issues associated with it. If necessary, links are provided to additional
documentation on an issue. As an active Docker user and community member,
please feel free to provide any feedback on these features you wish.
Expand Down
4 changes: 2 additions & 2 deletions image/spec/v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ This specification uses the following terms:
</dt>
<dd>
Each layer is given an ID upon its creation. It is
represented as a hexidecimal encoding of 256 bits, e.g.,
represented as a hexadecimal encoding of 256 bits, e.g.,
<code>a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
Image IDs should be sufficiently random so as to be globally unique.
32 bytes read from <code>/dev/urandom</code> is sufficient for all
Expand Down Expand Up @@ -109,7 +109,7 @@ This specification uses the following terms:
characters <code>[._-]</code>, however it MAY contain additional
<code>/</code> and <code>:</code> characters for organizational
purposes, with the last <code>:</code> character being interpreted
dividing the repository component of the name from the tag suffic
dividing the repository component of the name from the tag suffix
component.
</dd>
</dl>
Expand Down
4 changes: 2 additions & 2 deletions man/docker-build.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ into account Docker community conventions.

## Building an image using a URL

This will clone the specified Github repository from the URL and use it
This will clone the specified GitHub repository from the URL and use it
as context. The Dockerfile at the root of the repository is used as
Dockerfile. This only works if the Github repository is a dedicated
Dockerfile. This only works if the GitHub repository is a dedicated
repository.

docker build github.com/scollier/Fedora-Dockerfiles/tree/master/apache
Expand Down
Loading

0 comments on commit cd44018

Please sign in to comment.