diff --git a/.travis.yml b/.travis.yml
index a58f455..5879b21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Configures Rocket tests at Travis CI (https://travis-ci.org).
+# Configures rkt tests at Travis CI (https://travis-ci.org).
language: go
diff --git a/Documentation/app-container.md b/Documentation/app-container.md
index ce8b84b..c4de495 100644
--- a/Documentation/app-container.md
+++ b/Documentation/app-container.md
@@ -2,11 +2,11 @@
[App Container][appc-repo] is a [specification][appc-spec] of an image format, runtime, and discovery protocol for running applications in containers.
-Rocket implements the two runtime components of the specification: the [Application Container Executor (ACE)][appc-ace] and the [Metadata Service][appc-meta].
+rkt implements the two runtime components of the specification: the [Application Container Executor (ACE)][appc-ace] and the [Metadata Service][appc-meta].
It also leverages schema and code from the upstream [appc/spec][appc-spec] repo to manipulate ACIs, work with image and pod manifests, and perform image discovery.
-## Validating Rocket
+## Validating rkt
To validate that `rkt` successfully implements the ACE part of the spec, use the App Container [validation ACIs][appc-readme]:
diff --git a/Documentation/architecture.md b/Documentation/architecture.md
index 09be586..e272a8a 100644
--- a/Documentation/architecture.md
+++ b/Documentation/architecture.md
@@ -1,14 +1,14 @@
-# Rocket architecture
+# rkt architecture
## Overview
-Rocket consists only of a command-line tool, `rkt`, and does not have a daemon. This architecture allows Rocket to be updated in-place without affecting application containers which are currently running. It also means that levels of privilege can be separated out between different operations.
+rkt consists only of a command-line tool, `rkt`, and does not have a daemon. This architecture allows rkt to be updated in-place without affecting application containers which are currently running. It also means that levels of privilege can be separated out between different operations.
-All state in Rocket is communicated via the filesystem. Facilities like file-locking are used to ensure co-operation and mutual exclusion between concurrent invocations of the `rkt` command.
+All state in rkt is communicated via the filesystem. Facilities like file-locking are used to ensure co-operation and mutual exclusion between concurrent invocations of the `rkt` command.
## Stages
-Execution with Rocket is divided into several distinct stages.
+Execution with rkt is divided into several distinct stages.
### Stage 0
@@ -46,7 +46,7 @@ where:
- `stage1` is a copy of the stage1 ACI that is safe for read/write
- `stage1/manifest` is the manifest of the stage1 ACI
- `stage1/rootfs` is the rootfs of the stage1 ACI
-- `stage1/rootfs/init` is the actual stage1 binary to be executed (this path may vary according to the `coreos.com/rocket/stage1/init` Annotation of the stage1 ACI)
+- `stage1/rootfs/init` is the actual stage1 binary to be executed (this path may vary according to the `coreos.com/rkt/stage1/init` Annotation of the stage1 ACI)
- `stage1/rootfs/opt/stage2` are copies of the unpacked ACIs
At this point the stage0 execs `/stage1/rootfs/init` with the current working directory set to the root of the new filesystem.
diff --git a/Documentation/commands.md b/Documentation/commands.md
index 46519e2..b4b047b 100644
--- a/Documentation/commands.md
+++ b/Documentation/commands.md
@@ -1,4 +1,4 @@
-# Rocket Commands
+# rkt Commands
Work in progress. Please contribute if you see an area that needs more detail.
@@ -7,15 +7,15 @@ Work in progress. Please contribute if you see an area that needs more detail.
[aci-images]: https://github.com/appc/spec/blob/master/SPEC.md#app-container-image
[appc-discovery]: https://github.com/appc/spec/blob/master/SPEC.md#app-container-image-discovery
-Rocket runs applications packaged as [Application Container Images (ACI)][aci-images] an open-source specification. ACIs consist of the root filesystem of the application container, a manifest and an optional signature.
+rkt runs applications packaged as [Application Container Images (ACI)][aci-images] an open-source specification. ACIs consist of the root filesystem of the application container, a manifest and an optional signature.
-ACIs are named with a URL-like structure. This naming scheme allows for a decentralized discovery of ACIs, related signatures and public keys. Rocket uses these hints to execute [meta discovery][appc-discovery].
+ACIs are named with a URL-like structure. This naming scheme allows for a decentralized discovery of ACIs, related signatures and public keys. rkt uses these hints to execute [meta discovery][appc-discovery].
### rkt trust
-Before executing a remotely fetched ACI, Rocket will verify it based on attached signatures generated by the ACI creator.
+Before executing a remotely fetched ACI, rkt will verify it based on attached signatures generated by the ACI creator.
-Before this can happen, Rocket needs to know which creators you trust, and therefore are trusted to run images on your machine. The identity of each ACI creator is established with a public key, which is placed in Rocket's key store on disk.
+Before this can happen, rkt needs to know which creators you trust, and therefore are trusted to run images on your machine. The identity of each ACI creator is established with a public key, which is placed in rkt's key store on disk.
When adding a trusted key, a prefix can scope the level of established trust to a subset of images. A few examples:
@@ -35,7 +35,7 @@ $rkt trust --root coreos.com
#### Trust a Key Using Meta Discovery
-The easiest way to trust a key is through meta discovery. Rocket will find and download a public key that the creator has published on their website. This process is detailed in the [Application Container specification][appc-discovery]. The TL;DR is Rocket will find a meta tag that looks like:
+The easiest way to trust a key is through meta discovery. rkt will find and download a public key that the creator has published on their website. This process is detailed in the [Application Container specification][appc-discovery]. The TL;DR is rkt will find a meta tag that looks like:
```
@@ -54,7 +54,7 @@ Trusting "https://coreos.com/dist/pubkeys/aci-pubkeys.gpg" for prefix "coreos.co
Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.com/etcd/8b86de38890ddb7291867b025210bd8888182190"
```
-If Rocket can't find a key using meta discovery, an error will be printed:
+If rkt can't find a key using meta discovery, an error will be printed:
```
$ rkt trust --prefix coreos.com
@@ -80,7 +80,7 @@ Added key for prefix "coreos.com/etcd" at "/etc/rkt/trustedkeys/prefix.d/coreos.
Trusted public keys can be pre-populated by placing them in the appropriate location on disk for the desired prefix.
-_Depends on https://github.com/coreos/rocket/issues/500_
+_Depends on https://github.com/coreos/rkt/issues/500_
```
$ ls -l /etc/rkt/trustedkeys/
[insert example of root key vs prefixed key]
@@ -88,11 +88,11 @@ $ ls -l /etc/rkt/trustedkeys/
### rkt fetch
-Rocket uses HTTPS to locate and download remote ACIs and their attached signatures. If the ACI exists locally, it won't be re-downloaded.
+rkt uses HTTPS to locate and download remote ACIs and their attached signatures. If the ACI exists locally, it won't be re-downloaded.
#### Fetch with Meta Discovery
-The easiest way to fetch an ACI is through meta discovery. Rocket will find and download the ACI and signature from a location that the creator has published on their website. This process is detailed in the [Application Container specification][appc-discovery].
+The easiest way to fetch an ACI is through meta discovery. rkt will find and download the ACI and signature from a location that the creator has published on their website. This process is detailed in the [Application Container specification][appc-discovery].
If you have previously trusted the image creator, it will be downloaded and verified:
@@ -134,7 +134,7 @@ sha512-fa1cb92dc276b0f9bedf87981e61ecde
#### Fetch from a Docker registry
-If you want to run an existing Docker image, you can fetch from a Docker registry. Rocket will download and convert the image to ACI.
+If you want to run an existing Docker image, you can fetch from a Docker registry. rkt will download and convert the image to ACI.
```
$ rkt -insecure-skip-verify fetch docker://busybox
@@ -151,7 +151,7 @@ Docker images do not support signature verification.
## Running Pods
-Rocket can run ACIs based on name, hash, local file on disk or URL. If an ACI hasn't been cached on disk, Rocket will attempt to find and download it.
+rkt can run ACIs based on name, hash, local file on disk or URL. If an ACI hasn't been cached on disk, rkt will attempt to find and download it.
### rkt run
@@ -228,7 +228,7 @@ rkt: warning: signature verification has been disabled
Volumes are defined in each ACI and are referenced by name. Volumes can be exposed from the host into the pod (`host`) or initialized as empty storage to be accessed locally within the pod (`empty` pending [rkt #378][rkt #378]). Each volume can be selectively mounted into each application at differing mount points or not mounted into specific apps at all.
-[rkt #378]: https://github.com/coreos/rocket/issues/378
+[rkt #378]: https://github.com/coreos/rkt/issues/378
For `host` volumes, the `--volume` flag allows you to specify each mount, its type and the location on the host. The volume is then mounted into each app running to the pod based on information defined in the ACI manifest.
@@ -275,13 +275,13 @@ sudo ./rkt run --volume work,kind=host,source=/opt/tenant1/work \
#### Customize Networking
-The default networking configuration for Rocket is "host networking". This means that the apps within the pod will share the network stack and the interfaces with the host machine. Since the metadata service uses the pod IP for identity, rkt will not register the pod with the metadata service in this mode.
+The default networking configuration for rkt is "host networking". This means that the apps within the pod will share the network stack and the interfaces with the host machine. Since the metadata service uses the pod IP for identity, rkt will not register the pod with the metadata service in this mode.
##### Private Networking
Another common configuration, "private networking", means the pod will be executed with its own network stack. This is similar to how other container tools work. The [metadata service](metadata-service.md) (launched via `rkt metadata-service`) must be running to use private networking.
-By default, Rocket private networking will create a loopback device and a veth device. The veth pair creates a point-to-point link between the pod and the host. Rocket will allocate an IPv4 /31 (2 IP addresses) out of 172.16.28.0/24 and assign one IP to each end of the veth pair. It will additionally set a route for metadata service (169.254.169.255/32) and default route in the pod namespace. Finally, it will enable IP masquerading on the host to NAT the egress traffic.
+By default, rkt private networking will create a loopback device and a veth device. The veth pair creates a point-to-point link between the pod and the host. rkt will allocate an IPv4 /31 (2 IP addresses) out of 172.16.28.0/24 and assign one IP to each end of the veth pair. It will additionally set a route for metadata service (169.254.169.255/32) and default route in the pod namespace. Finally, it will enable IP masquerading on the host to NAT the egress traffic.
```
sudo ./rkt run --private-net coreos.com/etcd:v2.0.0
@@ -319,7 +319,7 @@ Work in progress. Please contribute!
### rkt gc
-Rocket has a built-in garbage collection command that is designed to be run periodically from a timer or cron job. Stopped pods are moved to the garbage and cleaned up during a subsequent garbage collection pass. Each `gc` pass removes any pods remaining in the garbage past the grace period. [Read more about the pod lifecycle][gc-docs].
+rkt has a built-in garbage collection command that is designed to be run periodically from a timer or cron job. Stopped pods are moved to the garbage and cleaned up during a subsequent garbage collection pass. Each `gc` pass removes any pods remaining in the garbage past the grace period. [Read more about the pod lifecycle][gc-docs].
[gc-docs]: pod-lifecycle.md#garbage-collection
diff --git a/Documentation/getting-started-guide.md b/Documentation/getting-started-guide.md
index 82884e3..3ec0de7 100644
--- a/Documentation/getting-started-guide.md
+++ b/Documentation/getting-started-guide.md
@@ -1,7 +1,7 @@
-# Getting Started with Rocket
+# Getting Started with rkt
The following guide will show you how to build and run a self-contained Go app using
-rocket, the reference implementation of the [App Container Specification](https://github.com/appc/spec).
+rkt, the reference implementation of the [App Container Specification](https://github.com/appc/spec).
## Create a hello go application
diff --git a/Documentation/getting-started-ubuntu-trusty.md b/Documentation/getting-started-ubuntu-trusty.md
index 613ad3b..df8292a 100644
--- a/Documentation/getting-started-ubuntu-trusty.md
+++ b/Documentation/getting-started-ubuntu-trusty.md
@@ -1,4 +1,4 @@
-# Getting Started with Rocket on Ubuntu Trusty
+# Getting Started with rkt on Ubuntu Trusty
The following guide will show you how to build and run the sample [etcd aci](https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.aci) on the standard vagrantcloud.com [box for ubuntu trusty](https://vagrantcloud.com/ubuntu/boxes/trusty64).
@@ -10,20 +10,20 @@ vagrant init ubuntu/trusty64
vagrant up --provider virtualbox
```
-## SSH into the VM, Install Rocket and Download the ACI
+## SSH into the VM, Install rkt and Download the ACI
```
vagrant ssh
sudo su
-wget https://github.com/coreos/rocket/releases/download/v0.3.1/rocket-v0.3.1.tar.gz
-tar xzvf rocket-v0.3.1.tar.gz
-cd rocket-v0.3.1
+wget https://github.com/coreos/rkt/releases/download/v0.3.1/rkt-v0.3.1.tar.gz
+tar xzvf rkt-v0.3.1.tar.gz
+cd rkt-v0.3.1
./rkt help
```
## Trust the CoreOS signing key
-This shows how to trust the CoreOS signing key with the procedure outlined in [Signing and Verification Guide](https://github.com/coreos/rocket/blob/master/Documentation/signing-and-verification-guide.md)
+This shows how to trust the CoreOS signing key with the procedure outlined in [Signing and Verification Guide](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md)
Download the public key
`curl -O https://coreos.com/dist/pubkeys/aci-pubkeys.gpg`
@@ -104,4 +104,4 @@ rkt: fetching image from https://github.com/coreos/etcd/releases/download/v2.0.0
Press ^] three times to kill container
```
-You are now running etcd inside of a Rocket pod on Ubuntu Trusty.
+You are now running etcd inside of a rkt pod on Ubuntu Trusty.
diff --git a/Documentation/hacking.md b/Documentation/hacking.md
index 7c1a079..bcf1e20 100644
--- a/Documentation/hacking.md
+++ b/Documentation/hacking.md
@@ -1,6 +1,6 @@
# Hacking Guide
-## Building Rocket
+## Building rkt
### Requirements
@@ -15,17 +15,17 @@
* Go 1.3+
* github.com/appc/spec (not yet vendored as it's in a continuous improvement phase)
-Once the requirements have been met you can build Rocket by running the following commands:
+Once the requirements have been met you can build rkt by running the following commands:
```
-git clone https://github.com/coreos/rocket.git
-cd rocket; ./build
+git clone https://github.com/coreos/rkt.git
+cd rkt; ./build
```
### With Docker
-Alternatively, you can build rocket in a docker container with the following command. Replace $SRC with the absolute path to your rocket source code:
+Alternatively, you can build rkt in a docker container with the following command. Replace $SRC with the absolute path to your rkt source code:
```
-$ sudo docker run -v $SRC:/opt/rocket -i -t golang:1.3 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath && cd /opt/rocket && go get github.com/appc/spec/... && ./build"
+$ sudo docker run -v $SRC:/opt/rkt -i -t golang:1.3 /bin/bash -c "apt-get update && apt-get install -y coreutils cpio squashfs-tools realpath && cd /opt/rkt && go get github.com/appc/spec/... && ./build"
```
diff --git a/Documentation/metadata-service.md b/Documentation/metadata-service.md
index e2a4ca2..e81f9e6 100644
--- a/Documentation/metadata-service.md
+++ b/Documentation/metadata-service.md
@@ -24,7 +24,7 @@ In order to avoid exposing host IP to the pods, the metadata service installs an
For non-production use, it is often convenient to launch the metadata service inline with running a pod.
`rkt run` accepts a `--spawn-metadata-svc` command line argument to launch the metadata service prior to running a pod.
When started in this fashion, the metadata service will exit when there are no more pods registered with it.
-Please note that it is strongly recommended to only use this mode when experimenting with Rocket on command line.
+Please note that it is strongly recommended to only use this mode when experimenting with rkt on command line.
## Using the metadata service
See [App Container specification](https://github.com/appc/spec/blob/master/SPEC.md#app-container-metadata-service) for more information about the metadata service including a list of supported endpoints and their usage.
diff --git a/Documentation/networking.md b/Documentation/networking.md
index 81982ac..7a9e5f0 100644
--- a/Documentation/networking.md
+++ b/Documentation/networking.md
@@ -8,7 +8,7 @@ By default, `rkt run` will start the pod with host networking.
This means that the apps within the pod will share the network stack and the interfaces with the host machine.
Since the metadata service uses the pod IP for identity, rkt will _not_ register the pod with the metadata service in this mode.
-Note: because of the lack of the metadata service Rocket does not strictly implement the app container specification in host mode.
+Note: because of the lack of the metadata service rkt does not strictly implement the app container specification in host mode.
## Private networking mode
@@ -17,14 +17,14 @@ The service will listen on 0.0.0.0:2375 by default and provides the private netw
Ideally this metadata service is launched via your systems init system.
If `rkt run` is started with `--private-net`, the pod will be executed with its own network stack.
-By default, Rocket will create a loopback device and a veth device. The veth pair creates a point-to-point link between the pod and the host.
-Rocket will allocate an IPv4 /31 (2 IP addresses) out of 172.16.28.0/24 and assign one IP to each end of the veth pair.
+By default, rkt will create a loopback device and a veth device. The veth pair creates a point-to-point link between the pod and the host.
+rkt will allocate an IPv4 /31 (2 IP addresses) out of 172.16.28.0/24 and assign one IP to each end of the veth pair.
It will additionally set a route for metadata service (169.254.169.255/32) and default route in the pod namespace.
Finally, it will enable IP masquerading on the host to NAT the egress traffic.
### Setting up additional networks
-In addition to the default network (veth) described in the previous section, Rocket pods can be configured to join additional networks.
+In addition to the default network (veth) described in the previous section, rkt pods can be configured to join additional networks.
Each additional network will result in an new interface being setup in the pod.
The type of network interface, IP, routes, etc is controlled via a configuration file residing in `/etc/rkt/net.d` directory.
The network configuration files are executed in lexicographically sorted order. Each file consists of a JSON dictionary as shown below:
@@ -45,7 +45,7 @@ The following fields apply to all configuration files.
Additional fields are specified for various types.
- **name** (string): An arbitrary label for the network. By convention the conf file is labeled with a leading ordinal, dash, network name, and .conf extension.
-- **type** (string): The type of network/interface to create. The type actually names a network plugin with Rocket bundled with few built-in ones.
+- **type** (string): The type of network/interface to create. The type actually names a network plugin with rkt bundled with few built-in ones.
- **ipam** (dict): IP Address Management -- controls the settings related to IP address assignment, gateway, and routes.
### Built-in network types
@@ -83,12 +83,12 @@ With the IP address allocated by the real network infrastructure, this makes the
#### ipvlan
-- [Coming soon](https://github.com/coreos/rocket/issues/479)
+- [Coming soon](https://github.com/coreos/rkt/issues/479)
## IP Address Management
The policy for IP address allocation, associated gateway and routes is separately configurable via the `ipam` section of the configuration file.
-Rocket currently ships with one type of IPAM (static) but DHCP is in the works. Like the network types, IPAM types can be implemented by third-parties via plugins.
+rkt currently ships with one type of IPAM (static) but DHCP is in the works. Like the network types, IPAM types can be implemented by third-parties via plugins.
### static
@@ -108,8 +108,8 @@ Consider the following conf:
}
```
-This configuration instructs Rocket to create `rkt1` Linux bridge and plugs pods into it via veths.
-Since the subnet is defined as `10.1.0.0/16`, Rocket will assign individual IPs out of that range.
+This configuration instructs rkt to create `rkt1` Linux bridge and plugs pods into it via veths.
+Since the subnet is defined as `10.1.0.0/16`, rkt will assign individual IPs out of that range.
The first pod will be assigned 10.1.0.2/16, next one 10.1.0.3/16, etc (it reserves 10.1.0.1/16 for gateway).
Additional configuration fields:
@@ -121,10 +121,10 @@ Additional configuration fields:
### dhcp
-[Coming soon](https://github.com/coreos/rocket/issues/558)
+[Coming soon](https://github.com/coreos/rkt/issues/558)
### Overriding default network
If a network has a name "default", it will override the default network added
-by Rocket. It is strongly recommended that such network also has type "veth" as
+by rkt. It is strongly recommended that such network also has type "veth" as
it protects from the pod spoofing its IP address and defeating identity
management provided by the metadata service.
diff --git a/Documentation/pod-lifecycle.md b/Documentation/pod-lifecycle.md
index 0b3ab5c..411d534 100644
--- a/Documentation/pod-lifecycle.md
+++ b/Documentation/pod-lifecycle.md
@@ -1,8 +1,8 @@
-# Life-cycle of a pod in rocket
+# Life-cycle of a pod in rkt
Throughout this document `$var` is used to refer to the directory `/var/lib/rkt/pods`, and `$uuid` refers to a pod's UUID e.g. "076292e6-54c4-4cc8-9fa7-679c5f7dcfd3".
-Due to rocket's lack of a management daemon process, a combination of advisory file locking and atomically changing (via rename(2)) directory locations is used to represent and transition the basic pod states.
+Due to rkt's lack of a management daemon process, a combination of advisory file locking and atomically changing (via rename(2)) directory locations is used to represent and transition the basic pod states.
At times where a state must be reliably coupled to an executing process, that process is executed with an open file descriptor possessing an exclusive advisory lock on the respective pod's directory. Should that process exit for any reason, its open file descriptors will automatically be closed by the kernel, implicitly unlocking the pod's directory in the process. By attempting to acquire a shared non-blocking advisory lock on a pod directory we're able to poll for these process-bound states, additionally by employing a blocking acquisition mode we may reliably synchronize indirectly with the exit of such processes, effectively providing us with a wake-up event the moment such a state transitions. For more information on advisory locks see the flock(2) man page.
@@ -65,7 +65,7 @@ Should #Prepare fail or be interrupted, `$var/prepare/$uuid` will be left in an
`rkt run` and `rkt run-prepared` both arrive here with the pod at `$var/run/$uuid` while holding the exclusive lock.
-The pod is then excuted while holding this lock. It is required that the stage 1 `coreos.com/rocket/stage1/run` entrypoint keep the file descriptor representing the exclusive lock open for the lifetime of the pod's process. All this requires is that the stage 1 implementation not close the inherited file descriptor. This is facilitated by supplying stage 1 its number in the RKT_LOCK_FD environment variable.
+The pod is then excuted while holding this lock. It is required that the stage 1 `coreos.com/rkt/stage1/run` entrypoint keep the file descriptor representing the exclusive lock open for the lifetime of the pod's process. All this requires is that the stage 1 implementation not close the inherited file descriptor. This is facilitated by supplying stage 1 its number in the RKT_LOCK_FD environment variable.
What follows applies equally to `rkt run` and `rkt run-prepared`.
diff --git a/Documentation/signing-and-verification-guide.md b/Documentation/signing-and-verification-guide.md
index 4a22f2e..ffadcc0 100644
--- a/Documentation/signing-and-verification-guide.md
+++ b/Documentation/signing-and-verification-guide.md
@@ -8,13 +8,13 @@ hello-0.0.1-linux-amd64.aci
* [Signing ACIs](#signing-acis)
* [Distributing Images via Meta Discovery](#distributing-images-via-meta-discovery)
-* [Verifying Images with Rocket](#verifying-images-with-rocket)
+* [Verifying Images with rkt](#verifying-images-with-rkt)
* [Establishing Trust](#establishing-trust)
* [Example Usage](#example-usage)
## Signing ACIs
-By default rocket requires ACIs to be signed using a gpg detached signature. The following steps will walk you through the creation of a gpg keypair suitable for signing an ACI. If you have an existing gpg signing key skip to the [Signing the ACI](signing-the-aci) step.
+By default rkt requires ACIs to be signed using a gpg detached signature. The following steps will walk you through the creation of a gpg keypair suitable for signing an ACI. If you have an existing gpg signing key skip to the [Signing the ACI](signing-the-aci) step.
### Generate a gpg signing key
@@ -30,9 +30,9 @@ Name-Real: Kelsey Hightower
Name-Comment: ACI signing key
Name-Email: kelsey.hightower@coreos.com
Expire-Date: 0
-Passphrase: rocket
-%pubring rocket.pub
-%secring rocket.sec
+Passphrase: rkt
+%pubring rkt.pub
+%secring rkt.sec
%commit
%echo done
```
@@ -46,10 +46,10 @@ $ gpg --batch --gen-key gpg-batch
#### List the keys
```
-$ gpg --no-default-keyring --secret-keyring ./rocket.sec --keyring ./rocket.pub --list-keys
+$ gpg --no-default-keyring --secret-keyring ./rkt.sec --keyring ./rkt.pub --list-keys
```
```
-./rocket.pub
+./rkt.pub
------------
pub 2048R/26EF7A14 2015-01-09
uid [ unknown] Kelsey Hightower (ACI signing key)
@@ -65,7 +65,7 @@ gpg: WARNING: This key is not certified with a trusted signature!
Since we know exactly where this key came from let's trust it:
```
-$ gpg --no-default-keyring --secret-keyring ./rocket.sec --keyring ./rocket.pub --edit-key 26EF7A14 trust
+$ gpg --no-default-keyring --secret-keyring ./rkt.sec --keyring ./rkt.pub --edit-key 26EF7A14 trust
gpg (GnuPG/MacGPG2) 2.0.22; Copyright (C) 2013 Free Software Foundation, Inc.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -104,7 +104,7 @@ gpg> quit
```
$ gpg --no-default-keyring --armor \
---secret-keyring ./rocket.sec --keyring ./rocket.pub \
+--secret-keyring ./rkt.sec --keyring ./rkt.pub \
--export kelsey.hightower@coreos.com > pubkeys.gpg
```
@@ -112,7 +112,7 @@ $ gpg --no-default-keyring --armor \
```
$ gpg --no-default-keyring --armor \
---secret-keyring ./rocket.sec --keyring ./rocket.pub \
+--secret-keyring ./rkt.sec --keyring ./rkt.pub \
--output hello-0.0.1-linux-amd64.aci.asc \
--detach-sig hello-0.0.1-linux-amd64.aci
```
@@ -121,7 +121,7 @@ $ gpg --no-default-keyring --armor \
```
$ gpg --no-default-keyring \
---secret-keyring ./rocket.sec --keyring ./rocket.pub \
+--secret-keyring ./rkt.sec --keyring ./rkt.pub \
--verify hello-0.0.1-linux-amd64.aci.asc hello-0.0.1-linux-amd64.aci
```
```
@@ -160,16 +160,16 @@ https://example.com/images/hello-0.0.1-linux-amd64.aci
https://example.com/pubkeys.gpg
```
-### Rocket Integration
+### rkt Integration
-Lets walk through the steps rocket takes when fetching images using Meta Discovery.
-The following rocket command:
+Lets walk through the steps rkt takes when fetching images using Meta Discovery.
+The following rkt command:
```
$ rkt run example.com/hello:0.0.1
```
-results in rocket retrieving the following URIs:
+results in rkt retrieving the following URIs:
```
https://example.com/hello?ac-discovery=1
@@ -183,18 +183,18 @@ The first response contains the template URL used to download the ACI image and
```
-Rocket populates the `{os}` and `{arch}` based on the current running system.
+rkt populates the `{os}` and `{arch}` based on the current running system.
The `{version}` will be taken from the tag given on the command line or "latest" if not supplied.
The `{ext}` will be substituted appropriately depending on artifact being retrieved: .aci will be used for ACI images and .aci.asc will be used for detached signatures.
-Once the ACI image has been downloaded rocket will extract the image's name from the image metadata. The image's name will be used to locate trusted public keys in the rocket keystore and perform signature validation.
+Once the ACI image has been downloaded rkt will extract the image's name from the image metadata. The image's name will be used to locate trusted public keys in the rkt keystore and perform signature validation.
-## Verifying Images with Rocket
+## Verifying Images with rkt
### Establishing Trust
-By default rocket does not trust any signing keys. Trust is established by storing public keys in the rocket keystore.
-The following directories make up the default rocket keystore layout:
+By default rkt does not trust any signing keys. Trust is established by storing public keys in the rkt keystore.
+The following directories make up the default rkt keystore layout:
```
/etc/rkt/trustedkeys/root.d
@@ -270,14 +270,14 @@ If you would like to trust a public key for any image store the public key in on
$ sudo rkt -h
Usage of rkt:
-debug=false: Print out more debug information to stderr
- -dir="/var/lib/rkt": rocket data directory
+ -dir="/var/lib/rkt": rkt data directory
-help=false: Print usage information and exit
-insecure-skip-verify=false: skip image verification
```
#### Download, verify and run an ACI
-By default rocket will attempt to download the ACI detached signature and verify the image:
+By default rkt will attempt to download the ACI detached signature and verify the image:
```
$ sudo rkt run example.com/hello:0.0.1
@@ -302,7 +302,7 @@ Downloading aci: [= ] 32.8 KB/1.26 MB
^]^]Container stage1 terminated by signal KILL.
```
-Notice when the `-insecure-skip-verify` flag is used, rocket will print the following warning:
+Notice when the `-insecure-skip-verify` flag is used, rkt will print the following warning:
```
rkt: warning: signature verification has been disabled
diff --git a/Documentation/stage1-implementors-guide.md b/Documentation/stage1-implementors-guide.md
index 64d56fd..5c5ddbc 100644
--- a/Documentation/stage1-implementors-guide.md
+++ b/Documentation/stage1-implementors-guide.md
@@ -4,7 +4,7 @@ Stage1 ACI implementor's guide
Background
----------
-Rocket's execution of pods is divided roughly into three separate stages:
+rkt's execution of pods is divided roughly into three separate stages:
0. Stage 0: discovering, fetching, verifying, storing, and compositing of both application (stage 2) and stage 1 images for execution.
1. Stage 1: execution of the stage 1 image from within the composite image prepared by stage 0.
@@ -23,20 +23,20 @@ Stage 2 is the destination application images and stage 1 is the vehicle for get
Entrypoints
-----------
-### `rkt run` => "coreos.com/rocket/stage1/run"
+### `rkt run` => "coreos.com/rkt/stage1/run"
0. rkt prepares the pod's stage 1 and stage 2 images and Pod Manifest under "/var/lib/rkt/pods/$uuid", acquiring an exclusive advisory lock on the directory.
1. chdirs to "/var/lib/rkt/pods/$uuid"
-2. resolves the "coreos.com/rocket/stage1/run" entrypoint via Annotations found within "/var/lib/rkt/pods/$uuid/stage1/manifest"
+2. resolves the "coreos.com/rkt/stage1/run" entrypoint via Annotations found within "/var/lib/rkt/pods/$uuid/stage1/manifest"
3. executes the resolved entrypoint relative to "/var/lib/rkt/pods/$uuid/stage1/rootfs"
It is the responsibility of this entrypoint to consume the Pod Manifest and execute the constituent apps in the appropriate environments as specified by the Pod Manifest.
The environment variable "RKT_LOCK_FD" contains the file descriptor number of the open directory handle for "/var/lib/rkt/pods/$uuid". It is necessary that stage 1 leave this file descriptor open and in its locked state for the duration of the `rkt run`.
-In the bundled rocket stage 1 which includes systemd-nspawn and systemd, the entrypoint is a static Go program found at "/init" within the stage 1 ACI rootfs. The majority of its execution entails generating a systemd-nspawn argument list and writing systemd unit files for the constituent apps before executing systemd-nspawn. Systemd-nspawn then boots the stage 1 systemd with the just-written unit files for launching the contained apps. The "/init" program is essentially a Pod Manifest to systemd-nspawn + systemd.service translator.
+In the bundled rkt stage 1 which includes systemd-nspawn and systemd, the entrypoint is a static Go program found at "/init" within the stage 1 ACI rootfs. The majority of its execution entails generating a systemd-nspawn argument list and writing systemd unit files for the constituent apps before executing systemd-nspawn. Systemd-nspawn then boots the stage 1 systemd with the just-written unit files for launching the contained apps. The "/init" program is essentially a Pod Manifest to systemd-nspawn + systemd.service translator.
-An alternative stage 1 could forego systemd-nspawn and systemd altogether, or retain these and introduce something like novm or qemu-kvm for greater isolation by first starting a VM. All that is required is an executable at the place indicated by the "coreos.com/rocket/stage1/run" entrypoint which knows how to apply the Pod Manifest and prepared ACI file-systems to good effect.
+An alternative stage 1 could forego systemd-nspawn and systemd altogether, or retain these and introduce something like novm or qemu-kvm for greater isolation by first starting a VM. All that is required is an executable at the place indicated by the "coreos.com/rkt/stage1/run" entrypoint which knows how to apply the Pod Manifest and prepared ACI file-systems to good effect.
#### Arguments
@@ -44,16 +44,16 @@ An alternative stage 1 could forego systemd-nspawn and systemd altogether, or re
* --private-net to trigger the creation of a private network
-### `rkt enter` => "coreos.com/rocket/stage1/enter"
+### `rkt enter` => "coreos.com/rkt/stage1/enter"
0. rkt verifies the pod and image to enter are valid and running
1. chdirs to "/var/lib/rkt/pods/$uuid"
-2. resolves the "coreos.com/rocket/stage1/enter" entrypoint via Annotations found within "/var/lib/rkt/pods/$uuid/stage1/manifest"
+2. resolves the "coreos.com/rkt/stage1/enter" entrypoint via Annotations found within "/var/lib/rkt/pods/$uuid/stage1/manifest"
3. executes the resolved entrypoint relative to "/var/lib/rkt/pods/$uuid/stage1/rootfs"
-In the bundled rocket stage 1 the entrypoint is a statically-linked C program found at "/enter" within the stage 1 ACI rootfs. This program enters the namespaces of the systemd-nspawn container's PID 1 before executing the "/diagexec" program which then chroots into the specific application's rootfs loading the application's environment variables as well.
+In the bundled rkt stage 1 the entrypoint is a statically-linked C program found at "/enter" within the stage 1 ACI rootfs. This program enters the namespaces of the systemd-nspawn container's PID 1 before executing the "/diagexec" program which then chroots into the specific application's rootfs loading the application's environment variables as well.
-An alternative stage 1 would need to do whatever is appropriate for entering the application's environment created by its own "coreos.com/rocket/stage1/run" entrypoint.
+An alternative stage 1 would need to do whatever is appropriate for entering the application's environment created by its own "coreos.com/rkt/stage1/run" entrypoint.
#### Arguments
@@ -72,7 +72,7 @@ Examples
{
"acKind": "ImageManifest",
"acVersion": "0.2.0",
- "name": "foo.com/rocket/stage1",
+ "name": "foo.com/rkt/stage1",
"labels": [
{
"name": "version",
@@ -89,11 +89,11 @@ Examples
],
"annotations": [
{
- "name": "coreos.com/rocket/stage1/run",
+ "name": "coreos.com/rkt/stage1/run",
"value": "/ex/run"
},
{
- "name": "coreos.com/rocket/stage1/enter",
+ "name": "coreos.com/rkt/stage1/enter",
"value": "/ex/enter"
}
]
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 65bb0c4..a40f7f8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,5 +1,5 @@
{
- "ImportPath": "github.com/coreos/rocket",
+ "ImportPath": "github.com/coreos/rkt",
"GoVersion": "go1.4.1",
"Packages": [
"./..."
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity.go
index d0030f6..a753ee9 100644
--- a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity.go
+++ b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity.go
@@ -23,8 +23,8 @@ import (
"regexp"
"strings"
- flag "github.com/coreos/rocket/Godeps/_workspace/src/github.com/spf13/pflag"
- "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+ flag "github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/pflag"
+ "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
)
// Quantity is a fixed-point representation of a number.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_example_test.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_example_test.go
index 988b439..46fbf07 100644
--- a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_example_test.go
+++ b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_example_test.go
@@ -19,7 +19,7 @@ package resource_test
import (
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
)
func ExampleFormat() {
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_test.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_test.go
index 23a7942..2f11169 100644
--- a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_test.go
+++ b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource/quantity_test.go
@@ -21,8 +21,8 @@ import (
"encoding/json"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/spf13/pflag"
- "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/pflag"
+ "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
fuzz "github.com/google/gofuzz"
)
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
index 0907d04..2b255b3 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/conversion_store.go
@@ -7,9 +7,9 @@ import (
"io/ioutil"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
index ac3e14a..49d8511 100644
--- a/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
+++ b/Godeps/_workspace/src/github.com/appc/docker2aci/lib/docker2aci.go
@@ -30,11 +30,11 @@ import (
"strings"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/docker2aci/tarball"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/docker2aci/tarball"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/build.go b/Godeps/_workspace/src/github.com/appc/spec/aci/build.go
index 0cfc6cc..61857ab 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/build.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/aci/build.go
@@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader"
)
// BuildWalker creates a filepath.WalkFunc that walks over the given root
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/file.go b/Godeps/_workspace/src/github.com/appc/spec/aci/file.go
index ad7a4b0..d619903 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/file.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/aci/file.go
@@ -15,7 +15,7 @@ import (
"os/exec"
"path/filepath"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
type FileType string
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go b/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
index eecc7ef..e9ba3c5 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/aci/layout.go
@@ -25,7 +25,7 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go b/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
index a919150..5150f99 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/aci/writer.go
@@ -7,7 +7,7 @@ import (
"io"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
// ArchiveWriter writes App Container Images. Users wanting to create an ACI or
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/build.go b/Godeps/_workspace/src/github.com/appc/spec/actool/build.go
index 77588ed..a6884d3 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/build.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/build.go
@@ -8,8 +8,8 @@ import (
"os"
"path/filepath"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
var (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go b/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
index be8cc3d..7ba1654 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/discover.go
@@ -5,7 +5,7 @@ import (
"runtime"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/discovery"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/discovery"
)
var (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/help.go b/Godeps/_workspace/src/github.com/appc/spec/actool/help.go
index 7840cb9..e632ae2 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/help.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/help.go
@@ -6,7 +6,7 @@ import (
"strings"
"text/template"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
var (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go b/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
index 23dede8..5ba9b73 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/validate.go
@@ -11,8 +11,8 @@ import (
"os"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/actool/version.go b/Godeps/_workspace/src/github.com/appc/spec/actool/version.go
index c406f1a..cd7c106 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/actool/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/actool/version.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
)
var cmdVersion = &Command{
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
index 2562aeb..71475dd 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery.go
@@ -7,8 +7,8 @@ import (
"regexp"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html/atom"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html/atom"
)
type acMeta struct {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery_test.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery_test.go
index d179360..978742f 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/discovery_test.go
@@ -7,7 +7,7 @@ import (
"os"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func fakeHTTPGet(filename string, failures int) func(uri string) (*http.Response, error) {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
index d962aef..85bbb66 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/parse.go
@@ -5,7 +5,7 @@ import (
"net/url"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
type App struct {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse_test.go b/Godeps/_workspace/src/github.com/appc/spec/discovery/parse_test.go
index f3daf0f..7ad9f5f 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/discovery/parse_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/discovery/parse_test.go
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func TestNewAppFromString(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
index aa44bdf..f812801 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer.go
@@ -10,8 +10,8 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
// An ACIRegistry provides all functions of an ACIProvider plus functions to
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer_test.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer_test.go
index 13e8a6e..3897ab3 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/acirenderer_test.go
@@ -10,8 +10,8 @@ import (
"reflect"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const tstprefix = "acirenderer-test"
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
index b5babb2..cdd63cc 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/resolve.go
@@ -3,7 +3,7 @@ package acirenderer
import (
"container/list"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
// CreateDepListFromImageID returns the flat dependency tree of the image with
diff --git a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/store_test.go b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/store_test.go
index f309dbd..eef67bc 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/store_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer/store_test.go
@@ -8,9 +8,9 @@ import (
"io/ioutil"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go b/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
index 2ea216e..2874da7 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/image.go
@@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go b/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
index ebec04f..b79b128 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/kind.go
@@ -3,7 +3,7 @@ package schema
import (
"encoding/json"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
type Kind struct {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
index 8b54836..6e7ade0 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/pod.go
@@ -5,7 +5,7 @@ import (
"errors"
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const PodManifestKind = types.ACKind("PodManifest")
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/pod_test.go b/Godeps/_workspace/src/github.com/appc/spec/schema/pod_test.go
index 96ccd1d..7696136 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/pod_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/pod_test.go
@@ -3,7 +3,7 @@ package schema
import (
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func TestPodManifestMerge(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
index 65da3d1..95e2643 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/isolator_resources.go
@@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
)
var (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
index 3fab255..02280a1 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver.go
@@ -3,7 +3,7 @@ package types
import (
"encoding/json"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
)
var (
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver_test.go b/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver_test.go
index 2c79be3..9230024 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver_test.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/types/semver_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
)
func TestMarshalSemver(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
index 4bc085c..b0e0bc4 100644
--- a/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
+++ b/Godeps/_workspace/src/github.com/appc/spec/schema/version.go
@@ -1,7 +1,7 @@
package schema
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
index b4b203a..a513940 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc.go
@@ -13,8 +13,8 @@ import (
"io"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var _ Filer = &ACIDFiler0{} // Ensure ACIDFiler0 is a Filer
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_test.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_test.go
index 81dd8db..7b6680a 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/2pc_test.go
@@ -14,7 +14,7 @@ import (
"os"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var _ Filer = &truncFiler{}
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
index ce61502..c7ecaa9 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree.go
@@ -12,9 +12,9 @@ import (
"sort"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/bufs"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/sortutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree_test.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree_test.go
index 1884ef8..7c3cfbb 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/btree_test.go
@@ -16,8 +16,8 @@ import (
"runtime"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
index 33c378b..3cb2215 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc.go
@@ -14,9 +14,9 @@ import (
"sort"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/bufs"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/zappy"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/zappy"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc_test.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc_test.go
index 7c0b7e1..b5e638a 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/falloc_test.go
@@ -17,9 +17,9 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/bufs"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/sortutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/zappy"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/bufs"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/zappy"
)
var (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
index ceea04e..a3c6724 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer.go
@@ -10,7 +10,7 @@ package lldb
import (
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
func doubleTrouble(first, second error) error {
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer_test.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer_test.go
index 9543200..21c9c7e 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/filer_test.go
@@ -13,7 +13,7 @@ import (
"runtime"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
)
// Bench knobs.
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
index d41c69e..462cf94 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/gb.go
@@ -13,7 +13,7 @@ import (
"fmt"
"math"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
index 4b2e220..fc56216 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/memfiler.go
@@ -81,8 +81,8 @@ import (
"fmt"
"io"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
index edce1c7..3b6d817 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/osfiler.go
@@ -8,7 +8,7 @@ import (
"io"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var _ Filer = (*OSFiler)(nil)
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
index 02ee78f..7df3648 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/simplefilefiler.go
@@ -9,8 +9,8 @@ package lldb
import (
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var _ Filer = &SimpleFileFiler{} // Ensure SimpleFileFiler is a Filer.
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
index b29fe6a..78f20ee 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact.go
@@ -55,8 +55,8 @@ import (
"io"
"sync"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var (
diff --git a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact_test.go b/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact_test.go
index 8a008d7..7aa5846 100644
--- a/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/exp/lldb/xact_test.go
@@ -12,8 +12,8 @@ import (
"math/rand"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
func (f *bitFiler) dump(w io.Writer) {
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/all_test.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/all_test.go
index 3be9206..5fd0317 100644
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/all_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/all_test.go
@@ -20,9 +20,9 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var (
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
index deb18eb..293b058 100644
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
+++ b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/falloc.go
@@ -16,7 +16,7 @@ package falloc
import (
"bytes"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
"sync"
)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
index bc797f9..86f5a2f 100644
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
+++ b/Godeps/_workspace/src/github.com/cznic/fileutil/falloc/test_deps.go
@@ -9,8 +9,8 @@ package falloc
// Pull test dependencies too.
// Enables easy 'go test X' after 'go get X'
import (
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil"
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
diff --git a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
index af1e5ee..c84d90e 100644
--- a/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
+++ b/Godeps/_workspace/src/github.com/cznic/fileutil/hdb/hdb.go
@@ -29,8 +29,8 @@ Conceptual analogy:
package hdb
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil/falloc"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/falloc"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/fileutil/storage"
)
type Store struct {
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
index b34aabb..ce4a1f1 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/example/example.go
@@ -11,7 +11,7 @@ package main
import (
"bufio"
"flag"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
"log"
"math"
"os"
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
index 86a0420..5c124da 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/example2/example2.go
@@ -10,7 +10,7 @@ package main
import (
"bytes"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
"image"
"image/png"
"io/ioutil"
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go b/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
index 8157211..ae4b5bc 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/example4/main.go
@@ -19,8 +19,8 @@ import (
"sort"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/sortutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/sortutil"
)
func main() {
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go b/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
index c5690c1..ef02102 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/ff/main.go
@@ -15,7 +15,7 @@ import (
"runtime"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/all_test.go b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/all_test.go
index 832d8dc..7fb120a 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/all_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/all_test.go
@@ -12,7 +12,7 @@ import (
"sync"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
func r32() *mathutil.FC32 {
diff --git a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
index 6020296..a3986d1 100644
--- a/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
+++ b/Godeps/_workspace/src/github.com/cznic/mathutil/mersenne/mersenne.go
@@ -24,7 +24,7 @@ import (
"math"
"math/big"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
"github.com/remyoudompheng/bigfft"
)
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/all_test.go b/Godeps/_workspace/src/github.com/cznic/ql/all_test.go
index fae3f45..336766f 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/all_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/all_test.go
@@ -25,7 +25,7 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/strutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/strutil"
)
// Note: All benchmarks report MB/s equal to record/s.
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go b/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
index 5e4a2f4..709ec53 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/driver/driver.go
@@ -53,7 +53,7 @@ Referenced from above:
*/
package driver
-import "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/ql"
+import "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql"
func init() {
ql.RegisterDriver()
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/file.go b/Godeps/_workspace/src/github.com/cznic/ql/file.go
index 29d4324..b99bd0f 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/file.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/file.go
@@ -20,9 +20,9 @@ import (
"sync"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/camlistore/lock"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/exp/lldb"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/camlistore/lock"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/exp/lldb"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
const (
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go b/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
index f62c2da..5d179f8 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/httpfs.go
@@ -14,7 +14,7 @@ import (
"strings"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
var (
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/introspection_test.go b/Godeps/_workspace/src/github.com/cznic/ql/introspection_test.go
index 792690c..98c5abc 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/introspection_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/introspection_test.go
@@ -12,7 +12,7 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
type (
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/parser.go b/Godeps/_workspace/src/github.com/cznic/ql/parser.go
index ac062e6..72a72c0 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/parser.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/parser.go
@@ -19,7 +19,7 @@ import __yyfmt__ "fmt"
import (
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
type yySymType struct {
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql.go b/Godeps/_workspace/src/github.com/cznic/ql/ql.go
index 1e7fe61..cee0b32 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/ql.go
@@ -22,7 +22,7 @@ import (
"sync"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/strutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/strutil"
)
// NOTE: all rset implementations must be safe for concurrent use by multiple
diff --git a/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go b/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
index 74c85b5..9b1f306 100644
--- a/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
+++ b/Godeps/_workspace/src/github.com/cznic/ql/ql/main.go
@@ -59,7 +59,7 @@ import (
"sort"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/ql"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql"
)
func str(data []interface{}) string {
diff --git a/Godeps/_workspace/src/github.com/cznic/sortutil/all_test.go b/Godeps/_workspace/src/github.com/cznic/sortutil/all_test.go
index a37727b..f3fbb6f 100644
--- a/Godeps/_workspace/src/github.com/cznic/sortutil/all_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/sortutil/all_test.go
@@ -13,7 +13,7 @@ import (
"strings"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
)
func dbg(s string, va ...interface{}) {
diff --git a/Godeps/_workspace/src/github.com/cznic/strutil/all_test.go b/Godeps/_workspace/src/github.com/cznic/strutil/all_test.go
index 9b74301..896136c 100644
--- a/Godeps/_workspace/src/github.com/cznic/strutil/all_test.go
+++ b/Godeps/_workspace/src/github.com/cznic/strutil/all_test.go
@@ -6,7 +6,7 @@ package strutil
import (
"bytes"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/mathutil"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/mathutil"
"math"
"strings"
"testing"
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
index 7903d89..b4738d0 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
+++ b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
@@ -9,7 +9,7 @@ import (
"net/http"
"path"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/gorilla/context"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/context"
)
// NewRouter returns a new router instance.
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
index 163ce16..615c5e0 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
+++ b/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
@@ -9,7 +9,7 @@ import (
"net/http"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/gorilla/context"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/context"
)
type routeTest struct {
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
index b985697..7570d5d 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/content-addressable-store/cas.go
@@ -5,7 +5,7 @@ import (
"fmt"
"io"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/peterbourgon/diskv"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv"
)
const transformBlockSize = 2 // grouping of chars per directory depth
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go
index 7967230..e39bee2 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/examples/super-simple-store/super-simple-store.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/peterbourgon/diskv"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv"
)
func main() {
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/import_test.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/import_test.go
index a0b552a..16bc3e5 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/import_test.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/import_test.go
@@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/peterbourgon/diskv"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv"
"testing"
)
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
index fd42b40..41eb6c7 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/index.go
@@ -1,7 +1,7 @@
package diskv
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/petar/GoLLRB/llrb"
"sync"
)
diff --git a/Godeps/_workspace/src/github.com/peterbourgon/diskv/keys_test.go b/Godeps/_workspace/src/github.com/peterbourgon/diskv/keys_test.go
index 7675eaf..bfd349b 100644
--- a/Godeps/_workspace/src/github.com/peterbourgon/diskv/keys_test.go
+++ b/Godeps/_workspace/src/github.com/peterbourgon/diskv/keys_test.go
@@ -6,7 +6,7 @@ import (
"strings"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/peterbourgon/diskv"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv"
)
var (
diff --git a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go b/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
index c2b7e98..85e4208 100644
--- a/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
+++ b/Godeps/_workspace/src/github.com/spf13/pflag/flag_test.go
@@ -14,7 +14,7 @@ import (
"testing"
"time"
- . "github.com/coreos/rocket/Godeps/_workspace/src/github.com/spf13/pflag"
+ . "github.com/coreos/rkt/Godeps/_workspace/src/github.com/spf13/pflag"
)
var (
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
index c34103f..89c6f7b 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
@@ -6,7 +6,7 @@ import (
"strings"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
// AddrAdd will add an IP address to a link device.
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
index a6c6bb5..42b1ca5 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
@@ -7,7 +7,7 @@ import (
"net"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
var native = nl.NativeEndian()
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
index 444def0..f17ba71 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
@@ -5,7 +5,7 @@ import (
"syscall"
"unsafe"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
const (
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
index e5e3680..ae34a19 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
@@ -11,7 +11,7 @@ package netlink
import (
"net"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
const (
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
index b602389..af4e1f0 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
@@ -4,7 +4,7 @@ import (
"fmt"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
func LinkGetProtinfo(link Link) (Protinfo, error) {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
index 64e7488..16cbdc3 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
@@ -5,7 +5,7 @@ import (
"net"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
// RtAttr is shared so it is in netlink_linux.go
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
index acfe43e..12d6dd8 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
@@ -3,7 +3,7 @@ package netlink
import (
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {
diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
index 5562e1c..b9447c5 100644
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
@@ -4,7 +4,7 @@ import (
"fmt"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
)
func writeStateAlgo(a *XfrmStateAlgo) []byte {
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
index 895d4bc..e889c71 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor/armor.go
@@ -10,7 +10,7 @@ import (
"bufio"
"bytes"
"encoding/base64"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
index 656bcd7..3ae634a 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign.go
@@ -18,9 +18,9 @@ import (
"net/textproto"
"strconv"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
)
// A Block represents a clearsigned message. A signature on a Block can
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go
index 3a94df6..eeb3793 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go
@@ -6,7 +6,7 @@ package clearsign
import (
"bytes"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
"testing"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
index 5895eaa..bf2aa4b 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys.go
@@ -6,9 +6,9 @@ package openpgp
import (
"crypto/rsa"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
"io"
"time"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys_test.go
index f3ef390..1dc9caa 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/keys_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
)
func TestKeyExpiry(t *testing.T) {
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
index 60395d1..071f20a 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/compressed.go
@@ -8,7 +8,7 @@ import (
"compress/bzip2"
"compress/flate"
"compress/zlib"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"strconv"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
index f299923..d0f3099 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/encrypted_key.go
@@ -7,8 +7,8 @@ package packet
import (
"crypto/rsa"
"encoding/binary"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"math/big"
"strconv"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
index 95c301d..a202609 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
@@ -7,8 +7,8 @@ package packet
import (
"crypto"
"encoding/binary"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
"io"
"strconv"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
index f866b45..d874061 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/opaque.go
@@ -6,7 +6,7 @@ package packet
import (
"bytes"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"io/ioutil"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
index 5c3b723..643923c 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet.go
@@ -11,8 +11,8 @@ import (
"crypto/aes"
"crypto/cipher"
"crypto/des"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/cast5"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/cast5"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"math/big"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet_test.go
index d2e718a..101248f 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/packet_test.go
@@ -8,7 +8,7 @@ import (
"bytes"
"encoding/hex"
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"io/ioutil"
"testing"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
index 2871a01..8e285fd 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/private_key.go
@@ -10,9 +10,9 @@ import (
"crypto/dsa"
"crypto/rsa"
"crypto/sha1"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
"io"
"io/ioutil"
"math/big"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
index 50a4255..1efa044 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key.go
@@ -16,8 +16,8 @@ import (
_ "crypto/sha512"
"encoding/binary"
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/elgamal"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"hash"
"io"
"math/big"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
index 47acbd1..269dc46 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/public_key_v3.go
@@ -16,7 +16,7 @@ import (
"strconv"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
)
// PublicKeyV3 represents older, version 3 public keys. These keys are less secure and
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
index c497f95..348bf24 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/reader.go
@@ -5,7 +5,7 @@
package packet
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
)
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
index 38b7c14..c0c72fc 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature.go
@@ -9,8 +9,8 @@ import (
"crypto/dsa"
"crypto/rsa"
"encoding/binary"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
"hash"
"io"
"strconv"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
index 32d2ca8..cfdeb39 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3.go
@@ -12,8 +12,8 @@ import (
"strconv"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
)
// SignatureV3 represents older version 3 signatures. These signatures are less secure
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3_test.go
index 937d913..0e17a71 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/signature_v3_test.go
@@ -12,7 +12,7 @@ import (
"io/ioutil"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
)
func TestSignatureV3Read(t *testing.T) {
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
index db93d5a..65b11a8 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
@@ -10,8 +10,8 @@ import (
"io"
"strconv"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
)
// This is the largest session key that we'll support. Since no 512-bit cipher
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
index e8cbe4f..2fb0ec9 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
@@ -8,7 +8,7 @@ import (
"crypto/cipher"
"crypto/sha1"
"crypto/subtle"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"hash"
"io"
"strconv"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go
index 3fb56de..efc3cfd 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go
@@ -8,7 +8,7 @@ import (
"bytes"
"crypto/sha1"
"encoding/hex"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"io/ioutil"
"testing"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
index bb5ffc5..6195cb2 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read.go
@@ -8,9 +8,9 @@ package openpgp
import (
"crypto"
_ "crypto/sha256"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
"hash"
"io"
"strconv"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read_test.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read_test.go
index e8a611d..73cb242 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/read_test.go
@@ -8,7 +8,7 @@ import (
"bytes"
_ "crypto/sha512"
"encoding/hex"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
"io"
"io/ioutil"
"strings"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
index b8301de..58928ff 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k/s2k.go
@@ -12,7 +12,7 @@ import (
"io"
"strconv"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
)
// Config collects configuration parameters for s2k key-stretching
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
index 62d9b12..2de4f8d 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/openpgp/write.go
@@ -6,10 +6,10 @@ package openpgp
import (
"crypto"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/packet"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/s2k"
"hash"
"io"
"strconv"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
index 7316e8b..ed0c19d 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
@@ -15,7 +15,7 @@ import (
"strings"
"unicode/utf8"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html"
"golang.org/x/text/encoding"
"golang.org/x/text/encoding/charmap"
"golang.org/x/text/transform"
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/example_test.go b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
index c888dae..33d0146 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
@@ -10,7 +10,7 @@ import (
"log"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html"
)
func ExampleParse() {
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/node.go b/Godeps/_workspace/src/golang.org/x/net/html/node.go
index 2094f86..9175d67 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/node.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/node.go
@@ -5,7 +5,7 @@
package html
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html/atom"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html/atom"
)
// A NodeType is the type of a Node.
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse.go b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
index b060f77..28fdf22 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/parse.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
@@ -10,7 +10,7 @@ import (
"io"
"strings"
- a "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html/atom"
+ a "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html/atom"
)
// A parser implements the HTML5 parsing algorithm:
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
index 2d2a137..3574665 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
@@ -18,7 +18,7 @@ import (
"strings"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html/atom"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html/atom"
)
// readParseTest reads a single test case from r.
diff --git a/Godeps/_workspace/src/golang.org/x/net/html/token.go b/Godeps/_workspace/src/golang.org/x/net/html/token.go
index 2e77627..ec7b9f0 100644
--- a/Godeps/_workspace/src/golang.org/x/net/html/token.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/token.go
@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/net/html/atom"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/net/html/atom"
)
// A TokenType is the type of a Token.
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec_test.go b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec_test.go
index 272af11..fe58e4c 100644
--- a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec_test.go
+++ b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/dec_test.go
@@ -8,7 +8,7 @@ import (
"strings"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+ "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
)
type decFunZZ func(z, x, y *inf.Dec) *inf.Dec
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/example_test.go b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/example_test.go
index 81f46b3..a49b079 100644
--- a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/example_test.go
+++ b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/example_test.go
@@ -5,7 +5,7 @@ import (
"log"
)
-import "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+import "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
func ExampleDec_SetString() {
d := new(inf.Dec)
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_example_test.go b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_example_test.go
index f157d69..2faa244 100644
--- a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_example_test.go
+++ b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_example_test.go
@@ -5,7 +5,7 @@ import (
"os"
"text/tabwriter"
- "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+ "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
)
// This example displays the results of Dec.Round with each of the Rounders.
diff --git a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_test.go b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_test.go
index 744dc68..5ea482c 100644
--- a/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_test.go
+++ b/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf/rounder_test.go
@@ -4,7 +4,7 @@ import (
"math/big"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
+ "github.com/coreos/rkt/Godeps/_workspace/src/speter.net/go/exp/math/dec/inf"
)
var decRounderInputs = [...]struct {
diff --git a/README.md b/README.md
index 8a72741..fa44ba6 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,38 @@
-# Rocket - App Container runtime
+# rkt - App Container runtime
-[](https://travis-ci.org/coreos/rocket)
-[](http://godoc.org/github.com/coreos/rocket)
+[](https://travis-ci.org/coreos/rkt)
+[](http://godoc.org/github.com/coreos/rkt)
-_Release early, release often: Rocket is currently a prototype and we are seeking your feedback via issues and pull requests_
+_Release early, release often: rkt is currently a prototype and we are seeking your feedback via issues and pull requests_
-Rocket is a CLI for running app containers, and an implementation of the [App Container Spec](Documentation/app-container.md). The goal of Rocket is to be composable, secure, and fast.
+rkt (pronounced _"rock-it"_) is a CLI for running app containers, and an implementation of the [App Container Spec](Documentation/app-container.md). The goal of rkt is to be composable, secure, and fast.
-[Read more about Rocket in the launch announcement](https://coreos.com/blog/rocket).
+[Read more about rkt in the launch announcement](https://coreos.com/blog/rocket).
-
+
-## Trying out Rocket
+## Trying out rkt
-The CLI for Rocket is called `rkt`, and is currently supported on amd64 Linux. A modern kernel is required but there should be no other system dependencies. We recommend booting up a fresh virtual machine to test out Rocket.
+The CLI for rkt is called `rkt`, and is currently supported on amd64 Linux. A modern kernel is required but there should be no other system dependencies. We recommend booting up a fresh virtual machine to test out rkt.
To install the `rkt` binary, grab the latest release directly from GitHub:
```
-wget https://github.com/coreos/rocket/releases/download/v0.5.2/rocket-v0.5.2.tar.gz
-tar xzvf rocket-v0.5.2.tar.gz
-cd rocket-v0.5.2
+wget https://github.com/coreos/rkt/releases/download/v0.5.2/rkt-v0.5.2.tar.gz
+tar xzvf rkt-v0.5.2.tar.gz
+cd rkt-v0.5.2
./rkt help
```
Keep in mind while running through the examples that right now `rkt` needs to be run as root for most operations.
-## Rocket basics
+## rkt basics
### Downloading an App Container Image (ACI)
-Rocket uses content addressable storage (CAS) for storing an ACI on disk. In this example, the image is downloaded and added to the CAS.
+rkt uses content addressable storage (CAS) for storing an ACI on disk. In this example, the image is downloaded and added to the CAS.
-Since Rocket verifies signatures by default, you will need to first [trust](https://github.com/coreos/rocket/blob/master/Documentation/signing-and-verification-guide.md#establishing-trust) the [CoreOS public key](https://coreos.com/dist/pubkeys/aci-pubkeys.gpg) used to sign the image:
+Since rkt verifies signatures by default, you will need to first [trust](https://github.com/coreos/rkt/blob/master/Documentation/signing-and-verification-guide.md#establishing-trust) the [CoreOS public key](https://coreos.com/dist/pubkeys/aci-pubkeys.gpg) used to sign the image:
```
$ sudo rkt trust --prefix coreos.com/etcd
@@ -102,14 +102,14 @@ In the latter case, `rkt` will do the appropriate ETag checking on the URL to ma
Note that the escape character ```^]``` is generated by ```Ctrl-]``` on a US keyboard. The required key combination will differ on other keyboard layouts. For example, the Swedish keyboard layout uses ```Ctrl-å``` on OS X and ```Ctrl-^``` on Windows to generate the ```^]``` escape character.
-## Contributing to Rocket
+## Contributing to rkt
-Rocket is an open source project under the Apache 2.0 [license](LICENSE), and contributions are gladly welcomed!
-See the [Hacking Guide](Documentation/hacking.md) for more information on how to build and work on Rocket.
+rkt is an open source project under the Apache 2.0 [license](LICENSE), and contributions are gladly welcomed!
+See the [Hacking Guide](Documentation/hacking.md) for more information on how to build and work on rkt.
See [CONTRIBUTING](CONTRIBUTING.md) for details on submitting patches and the contribution workflow.
## Contact
-- Mailing list: [rocket-dev](https://groups.google.com/forum/?hl=en#!forum/rocket-dev)
+- Mailing list: [rkt-dev](https://groups.google.com/forum/?hl=en#!forum/rkt-dev)
- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) on freenode.org
-- Planning/Roadmap: [milestones](https://github.com/coreos/rocket/milestones)
+- Planning/Roadmap: [milestones](https://github.com/coreos/rkt/milestones)
diff --git a/Vagrantfile b/Vagrantfile
index 483275f..c9a2eed 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,6 +10,6 @@ Vagrant.configure('2') do |config|
# install Build Dependencies (GOLANG)
config.vm.provision :shell, :privileged => false, :path => "scripts/vagrant/install-go.sh"
- # Install Rocket
- config.vm.provision :shell, :privileged => false, :path => "scripts/vagrant/install-rocket.sh"
+ # Install rkt
+ config.vm.provision :shell, :privileged => false, :path => "scripts/vagrant/install-rkt.sh"
end
diff --git a/build b/build
index f6a847e..e762e6a 100755
--- a/build
+++ b/build
@@ -1,7 +1,7 @@
#!/bin/bash -eu
ORG_PATH="github.com/coreos"
-REPO_PATH="${ORG_PATH}/rocket"
+REPO_PATH="${ORG_PATH}/rkt"
if [ ! -h gopath/src/${REPO_PATH} ]; then
mkdir -p gopath/src/${ORG_PATH}
@@ -40,7 +40,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
done
echo "Building actool..."
- go build -o ${GOBIN}/actool github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/actool
+ go build -o ${GOBIN}/actool github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/actool
export ACTOOL=${GOBIN}/actool
echo "Building init (stage1)..."
diff --git a/cas/cas.go b/cas/cas.go
index 777a26f..1400828 100644
--- a/cas/cas.go
+++ b/cas/cas.go
@@ -29,13 +29,13 @@ import (
"strings"
"time"
- "github.com/coreos/rocket/pkg/lock"
+ "github.com/coreos/rkt/pkg/lock"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/peterbourgon/diskv"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/peterbourgon/diskv"
)
const (
diff --git a/cas/cas_test.go b/cas/cas_test.go
index f84f12e..3ef69ea 100644
--- a/cas/cas_test.go
+++ b/cas/cas_test.go
@@ -25,8 +25,8 @@ import (
"testing"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/pkg/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/pkg/aci"
)
const tstprefix = "cas-test"
diff --git a/cas/db.go b/cas/db.go
index d62d476..b13ae98 100644
--- a/cas/db.go
+++ b/cas/db.go
@@ -20,9 +20,9 @@ import (
"os"
"path/filepath"
- "github.com/coreos/rocket/pkg/lock"
+ "github.com/coreos/rkt/pkg/lock"
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/cznic/ql/driver"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/cznic/ql/driver"
)
const (
diff --git a/cas/tree.go b/cas/tree.go
index d69f252..bc22149 100644
--- a/cas/tree.go
+++ b/cas/tree.go
@@ -11,10 +11,10 @@ import (
"path/filepath"
"sort"
- specaci "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/pkg/aci"
+ specaci "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/pkg/tarheader"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/pkg/aci"
)
const (
diff --git a/cas/tree_test.go b/cas/tree_test.go
index b2daf26..5c53074 100644
--- a/cas/tree_test.go
+++ b/cas/tree_test.go
@@ -6,7 +6,7 @@ import (
"os"
"testing"
- "github.com/coreos/rocket/pkg/aci"
+ "github.com/coreos/rkt/pkg/aci"
)
func treeStoreDSWriteACI(dir string, ds *Store) (string, error) {
diff --git a/cas/utils.go b/cas/utils.go
index 8f15635..5f48b1f 100644
--- a/cas/utils.go
+++ b/cas/utils.go
@@ -23,7 +23,7 @@ import (
"net/url"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
)
// blockTransform creates a path slice from the given string to use as a
diff --git a/common/common.go b/common/common.go
index d936c56..1860faa 100644
--- a/common/common.go
+++ b/common/common.go
@@ -25,8 +25,8 @@ import (
"path/filepath"
"strconv"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
const (
diff --git a/dist/init/systemd/rkt-metadata.service b/dist/init/systemd/rkt-metadata.service
index 3668644..246cf32 100644
--- a/dist/init/systemd/rkt-metadata.service
+++ b/dist/init/systemd/rkt-metadata.service
@@ -1,6 +1,6 @@
[Unit]
-Description=Rocket metadata service
-Documentation=http://github.com/coreos/rocket
+Description=rkt metadata service
+Documentation=http://github.com/coreos/rkt
After=network.target rkt-metadata.socket
Requires=rkt-metadata.socket
diff --git a/dist/init/systemd/rkt-metadata.socket b/dist/init/systemd/rkt-metadata.socket
index 31e1f06..38cd22b 100644
--- a/dist/init/systemd/rkt-metadata.socket
+++ b/dist/init/systemd/rkt-metadata.socket
@@ -1,5 +1,5 @@
[Unit]
-Description=Rocket metadata service socket
+Description=rkt metadata service socket
PartOf=rkt-metadata.service
[Socket]
diff --git a/networking/ipam/ipam.go b/networking/ipam/ipam.go
index 3fbacce..f0a0d58 100644
--- a/networking/ipam/ipam.go
+++ b/networking/ipam/ipam.go
@@ -10,9 +10,9 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/util"
)
// L3 config value for interface
diff --git a/networking/ipam/static/allocator.go b/networking/ipam/static/allocator.go
index 284a594..03bd9cd 100644
--- a/networking/ipam/static/allocator.go
+++ b/networking/ipam/static/allocator.go
@@ -4,9 +4,9 @@ import (
"fmt"
"net"
- "github.com/coreos/rocket/networking/ipam"
- "github.com/coreos/rocket/networking/ipam/static/backend"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/ipam"
+ "github.com/coreos/rkt/networking/ipam/static/backend"
+ "github.com/coreos/rkt/networking/util"
)
type IPAllocator struct {
diff --git a/networking/ipam/static/backend/disk/backend.go b/networking/ipam/static/backend/disk/backend.go
index a893c98..091c336 100644
--- a/networking/ipam/static/backend/disk/backend.go
+++ b/networking/ipam/static/backend/disk/backend.go
@@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
- "github.com/coreos/rocket/pkg/lock"
+ "github.com/coreos/rkt/pkg/lock"
)
var defaultDataDir = "/var/lib/rkt/networks"
diff --git a/networking/ipam/static/config.go b/networking/ipam/static/config.go
index 0d0280d..8e0b03c 100644
--- a/networking/ipam/static/config.go
+++ b/networking/ipam/static/config.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- rktnet "github.com/coreos/rocket/networking/net"
+ rktnet "github.com/coreos/rkt/networking/net"
)
var defaultConfigDir = "/etc/rkt/ipam.d"
diff --git a/networking/ipam/static/main.go b/networking/ipam/static/main.go
index 0cd89da..497f42f 100644
--- a/networking/ipam/static/main.go
+++ b/networking/ipam/static/main.go
@@ -5,9 +5,9 @@ import (
"errors"
"os"
- "github.com/coreos/rocket/networking/ipam"
- "github.com/coreos/rocket/networking/ipam/static/backend/disk"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/ipam"
+ "github.com/coreos/rkt/networking/ipam/static/backend/disk"
+ "github.com/coreos/rkt/networking/util"
)
func main() {
diff --git a/networking/net.go b/networking/net.go
index 70c7ac7..4fb0689 100644
--- a/networking/net.go
+++ b/networking/net.go
@@ -22,8 +22,8 @@ import (
"path"
"sort"
- "github.com/coreos/rocket/common"
- rktnet "github.com/coreos/rocket/networking/net"
+ "github.com/coreos/rkt/common"
+ rktnet "github.com/coreos/rkt/networking/net"
)
// Net encodes a network plugin.
diff --git a/networking/net/bridge/bridge.go b/networking/net/bridge/bridge.go
index cfe6475..9a9c1f2 100644
--- a/networking/net/bridge/bridge.go
+++ b/networking/net/bridge/bridge.go
@@ -21,12 +21,12 @@ import (
"runtime"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
- "github.com/coreos/rocket/networking/ipam"
- rktnet "github.com/coreos/rocket/networking/net"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/ipam"
+ rktnet "github.com/coreos/rkt/networking/net"
+ "github.com/coreos/rkt/networking/util"
)
const defaultBrName = "rkt0"
diff --git a/networking/net/macvlan/macvlan.go b/networking/net/macvlan/macvlan.go
index a29e18b..47c98ee 100644
--- a/networking/net/macvlan/macvlan.go
+++ b/networking/net/macvlan/macvlan.go
@@ -19,11 +19,11 @@ import (
"os"
"runtime"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
- "github.com/coreos/rocket/networking/ipam"
- rktnet "github.com/coreos/rocket/networking/net"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/ipam"
+ rktnet "github.com/coreos/rkt/networking/net"
+ "github.com/coreos/rkt/networking/util"
)
type Net struct {
diff --git a/networking/net/veth/veth.go b/networking/net/veth/veth.go
index 5fd08ca..36460a6 100644
--- a/networking/net/veth/veth.go
+++ b/networking/net/veth/veth.go
@@ -20,11 +20,11 @@ import (
"os"
"runtime"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
- "github.com/coreos/rocket/networking/ipam"
- rktnet "github.com/coreos/rocket/networking/net"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/ipam"
+ rktnet "github.com/coreos/rkt/networking/net"
+ "github.com/coreos/rkt/networking/util"
)
func init() {
diff --git a/networking/net_plugin.go b/networking/net_plugin.go
index 106c1ac..39158c0 100644
--- a/networking/net_plugin.go
+++ b/networking/net_plugin.go
@@ -24,8 +24,8 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/common"
- rktnet "github.com/coreos/rocket/networking/net"
+ "github.com/coreos/rkt/common"
+ rktnet "github.com/coreos/rkt/networking/net"
)
// TODO(eyakubovich): make this configurable in rkt.conf
diff --git a/networking/networking.go b/networking/networking.go
index 98a89d2..6bdc1d4 100644
--- a/networking/networking.go
+++ b/networking/networking.go
@@ -23,11 +23,11 @@ import (
"path/filepath"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
- "github.com/coreos/rocket/networking/netinfo"
- "github.com/coreos/rocket/networking/util"
+ "github.com/coreos/rkt/networking/netinfo"
+ "github.com/coreos/rkt/networking/util"
)
const (
diff --git a/networking/util/ipmasq.go b/networking/util/ipmasq.go
index 7a10936..14de00e 100644
--- a/networking/util/ipmasq.go
+++ b/networking/util/ipmasq.go
@@ -4,7 +4,7 @@ import (
"fmt"
"net"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
)
// Installs iptables rules to masquerade traffic
diff --git a/networking/util/link.go b/networking/util/link.go
index b2ecadf..f8f6889 100644
--- a/networking/util/link.go
+++ b/networking/util/link.go
@@ -20,7 +20,7 @@ import (
"net"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
)
func makeVeth(name, peer string, mtu int) (netlink.Link, error) {
diff --git a/networking/util/route.go b/networking/util/route.go
index e1a3f91..0eb5405 100644
--- a/networking/util/route.go
+++ b/networking/util/route.go
@@ -17,7 +17,7 @@ package util
import (
"net"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/vishvananda/netlink"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/vishvananda/netlink"
)
// AddDefaultRoute sets the default route on the given gateway.
diff --git a/networking/util/skel.go b/networking/util/skel.go
index 3cc21a2..32a7231 100644
--- a/networking/util/skel.go
+++ b/networking/util/skel.go
@@ -18,7 +18,7 @@ import (
"log"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
type CmdArgs struct {
diff --git a/pkg/aci/aci.go b/pkg/aci/aci.go
index e418a07..d7c6b91 100644
--- a/pkg/aci/aci.go
+++ b/pkg/aci/aci.go
@@ -27,9 +27,9 @@ import (
"strings"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
)
type ACIEntry struct {
diff --git a/pkg/aci/render.go b/pkg/aci/render.go
index 25a7181..cebfb52 100644
--- a/pkg/aci/render.go
+++ b/pkg/aci/render.go
@@ -4,9 +4,9 @@ import (
"archive/tar"
"fmt"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- ptar "github.com/coreos/rocket/pkg/tar"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/pkg/acirenderer"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ ptar "github.com/coreos/rkt/pkg/tar"
)
// Given an imageID, start with the matching image available in the store,
diff --git a/pkg/keystore/keystore.go b/pkg/keystore/keystore.go
index 9ebc424..141e536 100644
--- a/pkg/keystore/keystore.go
+++ b/pkg/keystore/keystore.go
@@ -26,8 +26,8 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
)
// A Config structure is used to configure a Keystore.
diff --git a/pkg/keystore/keystore_test.go b/pkg/keystore/keystore_test.go
index a0a15fe..7ffe3e2 100644
--- a/pkg/keystore/keystore_test.go
+++ b/pkg/keystore/keystore_test.go
@@ -33,9 +33,9 @@ import (
"path/filepath"
"testing"
- "github.com/coreos/rocket/pkg/keystore/keystoretest"
+ "github.com/coreos/rkt/pkg/keystore/keystoretest"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/errors"
)
func TestStoreTrustedKey(t *testing.T) {
diff --git a/pkg/keystore/keystoretest/keygen.go b/pkg/keystore/keystoretest/keygen.go
index 3f1147c..d4bf212 100644
--- a/pkg/keystore/keystoretest/keygen.go
+++ b/pkg/keystore/keystoretest/keygen.go
@@ -28,8 +28,8 @@ import (
"strings"
"text/template"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp/armor"
)
type Key struct {
diff --git a/pkg/keystore/keystoretest/opengpg.go b/pkg/keystore/keystoretest/opengpg.go
index 1ab1340..9fc355a 100644
--- a/pkg/keystore/keystoretest/opengpg.go
+++ b/pkg/keystore/keystoretest/opengpg.go
@@ -21,7 +21,7 @@ import (
"errors"
"io"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
)
// A KeyDetails represents an openpgp.Entity and its key details.
diff --git a/pkg/tar/tar_test.go b/pkg/tar/tar_test.go
index b7fc4d0..d97f51a 100644
--- a/pkg/tar/tar_test.go
+++ b/pkg/tar/tar_test.go
@@ -201,7 +201,7 @@ func TestExtractTarInsecureSymlink(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
tr := tar.NewReader(containerTar)
- tmpdir, err := ioutil.TempDir("", "rocket-temp-dir")
+ tmpdir, err := ioutil.TempDir("", "rkt-temp-dir")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -288,7 +288,7 @@ func TestExtractTarFolders(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
tr := tar.NewReader(containerTar)
- tmpdir, err := ioutil.TempDir("", "rocket-temp-dir")
+ tmpdir, err := ioutil.TempDir("", "rkt-temp-dir")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -435,7 +435,7 @@ func TestExtractTarPWL(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
tr := tar.NewReader(containerTar)
- tmpdir, err := ioutil.TempDir("", "rocket-temp-dir")
+ tmpdir, err := ioutil.TempDir("", "rkt-temp-dir")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -457,7 +457,7 @@ func TestExtractTarPWL(t *testing.T) {
}
func TestExtractTarOverwrite(t *testing.T) {
- tmpdir, err := ioutil.TempDir("", "rocket-temp-dir")
+ tmpdir, err := ioutil.TempDir("", "rkt-temp-dir")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -688,7 +688,7 @@ func TestExtractTarTimes(t *testing.T) {
t.Errorf("unexpected error: %v", err)
}
tr := tar.NewReader(containerTar)
- tmpdir, err := ioutil.TempDir("", "rocket-temp-dir")
+ tmpdir, err := ioutil.TempDir("", "rkt-temp-dir")
if err != nil {
t.Errorf("unexpected error: %v", err)
}
diff --git a/rkt/doc.go b/rkt/doc.go
index 704ac2c..d32c2c8 100644
--- a/rkt/doc.go
+++ b/rkt/doc.go
@@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Package rkt (main) implements the command line interface to rocket
+// Package rkt (main) implements the command line interface to rkt
package main
diff --git a/rkt/enter.go b/rkt/enter.go
index 5454c68..1cff522 100644
--- a/rkt/enter.go
+++ b/rkt/enter.go
@@ -21,11 +21,11 @@ import (
"io/ioutil"
"path/filepath"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/stage0"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/stage0"
)
var (
diff --git a/rkt/fetch.go b/rkt/fetch.go
index 124629f..ecd8dcf 100644
--- a/rkt/fetch.go
+++ b/rkt/fetch.go
@@ -24,14 +24,14 @@ import (
"strings"
"time"
- docker2aci "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/docker2aci/lib"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/discovery"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/mitchellh/ioprogress"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/pkg/keystore"
+ docker2aci "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/docker2aci/lib"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/discovery"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/mitchellh/ioprogress"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/pkg/keystore"
)
const (
diff --git a/rkt/fetch_test.go b/rkt/fetch_test.go
index 4be5815..0dc9043 100644
--- a/rkt/fetch_test.go
+++ b/rkt/fetch_test.go
@@ -27,13 +27,13 @@ import (
"reflect"
"testing"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/pkg/aci"
- "github.com/coreos/rocket/pkg/keystore"
- "github.com/coreos/rocket/pkg/keystore/keystoretest"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/pkg/aci"
+ "github.com/coreos/rkt/pkg/keystore"
+ "github.com/coreos/rkt/pkg/keystore/keystoretest"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/discovery"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/discovery"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func TestNewDiscoveryApp(t *testing.T) {
diff --git a/rkt/help.go b/rkt/help.go
index 1636f02..3486a4a 100644
--- a/rkt/help.go
+++ b/rkt/help.go
@@ -20,7 +20,7 @@ import (
"strings"
"text/template"
- "github.com/coreos/rocket/version"
+ "github.com/coreos/rkt/version"
)
var (
diff --git a/rkt/install.go b/rkt/install.go
index 8d28bd7..2abcbe3 100644
--- a/rkt/install.go
+++ b/rkt/install.go
@@ -25,7 +25,7 @@ import (
)
const (
- rocketGroup = "rocket"
+ rktGroup = "rkt"
groupFilePath = "/etc/group"
casDbPerm = os.FileMode(0664)
)
@@ -33,7 +33,7 @@ const (
var (
cmdInstall = &Command{
Name: "install",
- Summary: "Set up Rocket data directories with correct permissions",
+ Summary: "Set up rkt data directories with correct permissions",
Usage: "",
Run: runInstall,
}
@@ -205,14 +205,14 @@ func setCasDbFilesPermissions(casDbPath string, gid int, perm os.FileMode) error
}
func runInstall(args []string) (exit int) {
- gid, err := lookupGid(rocketGroup)
+ gid, err := lookupGid(rktGroup)
if err != nil {
- stderr("install: error looking up rocket gid: %v", err)
+ stderr("install: error looking up rkt gid: %v", err)
return 1
}
if err := createDirStructure(gid); err != nil {
- stderr("install: error creating Rocket directory structure: %v", err)
+ stderr("install: error creating rkt directory structure: %v", err)
return 1
}
@@ -229,7 +229,7 @@ func runInstall(args []string) (exit int) {
return 1
}
- fmt.Println("Rocket directory structure successfully created.")
+ fmt.Println("rkt directory structure successfully created.")
return 0
}
diff --git a/rkt/list.go b/rkt/list.go
index 86d497a..98062f5 100644
--- a/rkt/list.go
+++ b/rkt/list.go
@@ -20,9 +20,9 @@ import (
"fmt"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- common "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/networking/netinfo"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ common "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/networking/netinfo"
)
var (
diff --git a/rkt/metadata_service.go b/rkt/metadata_service.go
index 750539c..0891cb7 100644
--- a/rkt/metadata_service.go
+++ b/rkt/metadata_service.go
@@ -34,10 +34,10 @@ import (
"sync"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/gorilla/mux"
- "github.com/coreos/rocket/common"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/gorilla/mux"
+ "github.com/coreos/rkt/common"
)
var (
diff --git a/rkt/metadata_service_test.go b/rkt/metadata_service_test.go
index e8a0922..056f6b7 100644
--- a/rkt/metadata_service_test.go
+++ b/rkt/metadata_service_test.go
@@ -18,8 +18,8 @@ import (
"reflect"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func setupPodStoreTest(t *testing.T) (*podStore, *types.UUID, string, string) {
diff --git a/rkt/pods.go b/rkt/pods.go
index 9be2f38..bd2dbb6 100644
--- a/rkt/pods.go
+++ b/rkt/pods.go
@@ -26,12 +26,12 @@ import (
"syscall"
"time"
- "github.com/coreos/rocket/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/networking/netinfo"
- "github.com/coreos/rocket/pkg/lock"
+ "github.com/coreos/rkt/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/networking/netinfo"
+ "github.com/coreos/rkt/pkg/lock"
)
// see Documentation/pod-lifecycle.md for some explanation
diff --git a/rkt/pods_test.go b/rkt/pods_test.go
index 007726e..4636df4 100644
--- a/rkt/pods_test.go
+++ b/rkt/pods_test.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"
- "github.com/coreos/rocket/pkg/lock"
+ "github.com/coreos/rkt/pkg/lock"
)
func TestWalkPods(t *testing.T) {
diff --git a/rkt/prepare.go b/rkt/prepare.go
index e04390c..77b5b38 100644
--- a/rkt/prepare.go
+++ b/rkt/prepare.go
@@ -21,16 +21,16 @@ import (
"log"
"os"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/stage0"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/stage0"
)
var (
cmdPrepare = &Command{
Name: "prepare",
- Summary: "Prepare to run image(s) in a pod in rocket",
+ Summary: "Prepare to run image(s) in a pod in rkt",
Usage: "[--volume name,kind=host,...] [--quiet] IMAGE [-- image-args...[---]]...",
Description: `Image should be a string referencing an image; either a hash, local file on disk, or URL.
They will be checked in that order and the first match will be used.
@@ -45,7 +45,7 @@ End the image arguments with a lone "---" to resume argument parsing.`,
func init() {
commands = append(commands, cmdPrepare)
- cmdPrepare.Flags.StringVar(&flagStage1Image, "stage1-image", defaultStage1Image, `image to use as stage1. Local paths and http/https URLs are supported. If empty, Rocket will look for a file called "stage1.aci" in the same directory as rkt itself`)
+ cmdPrepare.Flags.StringVar(&flagStage1Image, "stage1-image", defaultStage1Image, `image to use as stage1. Local paths and http/https URLs are supported. If empty, rkt will look for a file called "stage1.aci" in the same directory as rkt itself`)
cmdPrepare.Flags.Var(&flagVolumes, "volume", "volumes to mount into the pod")
cmdPrepare.Flags.BoolVar(&flagQuiet, "quiet", false, "suppress superfluous output on stdout, print only the UUID on success")
cmdPrepare.Flags.BoolVar(&flagInheritEnv, "inherit-env", false, "inherit all environment variables not set by apps")
diff --git a/rkt/rkt.go b/rkt/rkt.go
index 12bb396..917eb10 100644
--- a/rkt/rkt.go
+++ b/rkt/rkt.go
@@ -23,12 +23,12 @@ import (
"strings"
"text/tabwriter"
- "github.com/coreos/rocket/pkg/keystore"
+ "github.com/coreos/rkt/pkg/keystore"
)
const (
cliName = "rkt"
- cliDescription = "rocket, the application container runner"
+ cliDescription = "rkt, the application container runner"
defaultDataDir = "/var/lib/rkt"
)
@@ -48,7 +48,7 @@ var (
func init() {
globalFlagset.BoolVar(&globalFlags.Help, "help", false, "Print usage information and exit")
globalFlagset.BoolVar(&globalFlags.Debug, "debug", false, "Print out more debug information to stderr")
- globalFlagset.StringVar(&globalFlags.Dir, "dir", defaultDataDir, "rocket data directory")
+ globalFlagset.StringVar(&globalFlags.Dir, "dir", defaultDataDir, "rkt data directory")
globalFlagset.BoolVar(&globalFlags.InsecureSkipVerify, "insecure-skip-verify", false, "skip image or key verification")
}
diff --git a/rkt/run.go b/rkt/run.go
index 45ed9fa..09d4586 100644
--- a/rkt/run.go
+++ b/rkt/run.go
@@ -24,11 +24,11 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/pkg/keystore"
- "github.com/coreos/rocket/stage0"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/pkg/keystore"
+ "github.com/coreos/rkt/stage0"
)
var (
@@ -44,7 +44,7 @@ var (
flagNoOverlay bool
cmdRun = &Command{
Name: "run",
- Summary: "Run image(s) in a pod in rocket",
+ Summary: "Run image(s) in a pod in rkt",
Usage: "[--volume name,kind=host,...] IMAGE [-- image-args...[---]]...",
Description: `IMAGE should be a string referencing an image; either a hash, local file on disk, or URL.
They will be checked in that order and the first match will be used.
@@ -67,7 +67,7 @@ func init() {
}
}
- cmdRun.Flags.StringVar(&flagStage1Image, "stage1-image", defaultStage1Image, `image to use as stage1. Local paths and http/https URLs are supported. If empty, Rocket will look for a file called "stage1.aci" in the same directory as rkt itself`)
+ cmdRun.Flags.StringVar(&flagStage1Image, "stage1-image", defaultStage1Image, `image to use as stage1. Local paths and http/https URLs are supported. If empty, rkt will look for a file called "stage1.aci" in the same directory as rkt itself`)
cmdRun.Flags.Var(&flagVolumes, "volume", "volumes to mount into the pod")
cmdRun.Flags.BoolVar(&flagPrivateNet, "private-net", false, "give pod a private network")
cmdRun.Flags.BoolVar(&flagSpawnMetadataService, "spawn-metadata-svc", false, "launch metadata svc if not running")
diff --git a/rkt/run_prepared.go b/rkt/run_prepared.go
index 97f2038..6da372e 100644
--- a/rkt/run_prepared.go
+++ b/rkt/run_prepared.go
@@ -20,8 +20,8 @@ import (
"io/ioutil"
"log"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/stage0"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/stage0"
)
const (
@@ -31,7 +31,7 @@ const (
var (
cmdRunPrepared = &Command{
Name: cmdRunPreparedName,
- Summary: "Run a prepared application pod in rocket",
+ Summary: "Run a prepared application pod in rkt",
Usage: "UUID",
Description: "UUID must have been acquired via `rkt prepare`",
Run: runRunPrepared,
diff --git a/rkt/trust.go b/rkt/trust.go
index 3dd0be9..ae566df 100644
--- a/rkt/trust.go
+++ b/rkt/trust.go
@@ -14,7 +14,7 @@
//+build linux
-// implements https://github.com/coreos/rocket/issues/367
+// implements https://github.com/coreos/rkt/issues/367
package main
@@ -28,9 +28,9 @@ import (
"os"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/discovery"
- "github.com/coreos/rocket/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
- "github.com/coreos/rocket/pkg/keystore"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/discovery"
+ "github.com/coreos/rkt/Godeps/_workspace/src/golang.org/x/crypto/openpgp"
+ "github.com/coreos/rkt/pkg/keystore"
)
var (
diff --git a/rkt/uuid.go b/rkt/uuid.go
index 9f1f5ee..98d4f7d 100644
--- a/rkt/uuid.go
+++ b/rkt/uuid.go
@@ -20,7 +20,7 @@ import (
"fmt"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
// matchUUID attempts to match the uuid specified as uuid against all pods present.
diff --git a/rkt/version.go b/rkt/version.go
index c88a9a2..6aa81cf 100644
--- a/rkt/version.go
+++ b/rkt/version.go
@@ -15,8 +15,8 @@
package main
import (
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/version"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/version"
)
var cmdVersion = &Command{
diff --git a/scripts/vagrant/install-rocket.sh b/scripts/vagrant/install-rkt.sh
similarity index 100%
rename from scripts/vagrant/install-rocket.sh
rename to scripts/vagrant/install-rkt.sh
diff --git a/stage0/enter.go b/stage0/enter.go
index 5d3f85e..774bb19 100644
--- a/stage0/enter.go
+++ b/stage0/enter.go
@@ -21,7 +21,7 @@ import (
"os"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
// Enter enters the pod/app by exec()ing the stage1's /enter similar to /init
diff --git a/stage0/entrypoint.go b/stage0/entrypoint.go
index 6fed793..28b4dbf 100644
--- a/stage0/entrypoint.go
+++ b/stage0/entrypoint.go
@@ -21,13 +21,13 @@ import (
"fmt"
"io/ioutil"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/common"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/common"
)
const (
- enterEntrypoint = "coreos.com/rocket/stage1/enter"
- runEntrypoint = "coreos.com/rocket/stage1/run"
+ enterEntrypoint = "coreos.com/rkt/stage1/enter"
+ runEntrypoint = "coreos.com/rkt/stage1/run"
)
// getEntrypoint retrieves the named entrypoint from the stage1 manifest for a given pod
diff --git a/stage0/run.go b/stage0/run.go
index e86ab3e..f7f37eb 100644
--- a/stage0/run.go
+++ b/stage0/run.go
@@ -17,9 +17,9 @@
package stage0
//
-// Rocket is a reference implementation of the app container specification.
+// rkt is a reference implementation of the app container specification.
//
-// Execution on Rocket is divided into a number of stages, and the `rkt`
+// Execution on rkt is divided into a number of stages, and the `rkt`
// binary implements the first stage (stage 0)
//
@@ -36,13 +36,13 @@ import (
"strings"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/cas"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/pkg/aci"
- "github.com/coreos/rocket/pkg/sys"
- "github.com/coreos/rocket/version"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/cas"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/pkg/aci"
+ "github.com/coreos/rkt/pkg/sys"
+ "github.com/coreos/rkt/version"
)
// configuration parameters required by Prepare
@@ -52,7 +52,7 @@ type PrepareConfig struct {
ExecAppends [][]string // appendages to each image's app.exec lines (empty when none, length should match length of Images)
InheritEnv bool // inherit parent environment into apps
ExplicitEnv []string // always set these environment variables for all the apps
- Volumes []types.Volume // list of volumes that rocket can provide to applications
+ Volumes []types.Volume // list of volumes that rkt can provide to applications
UseOverlay bool // prepare pod with overlay fs
}
@@ -71,7 +71,7 @@ type CommonConfig struct {
Stage1Image types.Hash // stage1 image containing usable /init and /enter entrypoints
UUID *types.UUID // UUID of the pod
Images []types.Hash // application images
- PodsDir string // root directory for rocket pods
+ PodsDir string // root directory for rkt pods
Debug bool
}
diff --git a/stage1/dummy.go b/stage1/dummy.go
index c921882..f59d995 100644
--- a/stage1/dummy.go
+++ b/stage1/dummy.go
@@ -3,6 +3,6 @@ package dummy
// This is a dummy package to ensure that Godep vendors
// actool, which is used in building the stage1 ACI
import (
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/aci"
- _ "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/actool"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/aci"
+ _ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/actool"
)
diff --git a/stage1/init/container.go b/stage1/init/container.go
index 60e405a..df52d90 100644
--- a/stage1/init/container.go
+++ b/stage1/init/container.go
@@ -27,10 +27,10 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/coreos/go-systemd/unit"
- "github.com/coreos/rocket/common"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/coreos/go-systemd/unit"
+ "github.com/coreos/rkt/common"
)
// Pod encapsulates a PodManifest and ImageManifests
diff --git a/stage1/init/container_test.go b/stage1/init/container_test.go
index 0aeb640..924a94f 100644
--- a/stage1/init/container_test.go
+++ b/stage1/init/container_test.go
@@ -18,8 +18,8 @@ import (
"strings"
"testing"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
)
func TestQuoteExec(t *testing.T) {
diff --git a/stage1/init/init.go b/stage1/init/init.go
index cec3f23..4e9898d 100644
--- a/stage1/init/init.go
+++ b/stage1/init/init.go
@@ -28,11 +28,11 @@ import (
"runtime"
"syscall"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/common"
- "github.com/coreos/rocket/networking"
- "github.com/coreos/rocket/pkg/sys"
+ "github.com/coreos/rkt/common"
+ "github.com/coreos/rkt/networking"
+ "github.com/coreos/rkt/pkg/sys"
)
const (
diff --git a/stage1/init/path.go b/stage1/init/path.go
index 99dd678..e01d6d3 100644
--- a/stage1/init/path.go
+++ b/stage1/init/path.go
@@ -20,8 +20,8 @@ import (
"path/filepath"
"strings"
- "github.com/coreos/rocket/Godeps/_workspace/src/github.com/appc/spec/schema/types"
- "github.com/coreos/rocket/common"
+ "github.com/coreos/rkt/Godeps/_workspace/src/github.com/appc/spec/schema/types"
+ "github.com/coreos/rkt/common"
)
const (
diff --git a/stage1/init/registration.go b/stage1/init/registration.go
index 057da3b..4b1ed78 100644
--- a/stage1/init/registration.go
+++ b/stage1/init/registration.go
@@ -27,7 +27,7 @@ import (
"syscall"
"time"
- "github.com/coreos/rocket/common"
+ "github.com/coreos/rkt/common"
)
const retryCount = 3
@@ -37,7 +37,7 @@ var retryPause = time.Second
var errUnreachable = errors.New(`could not reach the metadata service.
Make sure metadata service is currently running.
For more information on running metadata service,
-see https://github.com/coreos/rocket/blob/master/Documentation/metadata-service.md`)
+see https://github.com/coreos/rkt/blob/master/Documentation/metadata-service.md`)
func registerPod(p *Pod, ip net.IP) error {
uuid := p.UUID.String()
diff --git a/stage1/rootfs/aggregate/aci-manifest b/stage1/rootfs/aggregate/aci-manifest
index 4df7a4f..2174f57 100644
--- a/stage1/rootfs/aggregate/aci-manifest
+++ b/stage1/rootfs/aggregate/aci-manifest
@@ -1,7 +1,7 @@
{
"acKind": "ImageManifest",
"acVersion": "0.5.2",
- "name": "coreos.com/rocket/stage1",
+ "name": "coreos.com/rkt/stage1",
"labels": [
{
"name": "version",
@@ -18,11 +18,11 @@
],
"annotations": [
{
- "name": "coreos.com/rocket/stage1/run",
+ "name": "coreos.com/rkt/stage1/run",
"value": "/init"
},
{
- "name": "coreos.com/rocket/stage1/enter",
+ "name": "coreos.com/rkt/stage1/enter",
"value": "/enter"
}
]
diff --git a/stage1/rootfs/aggregate/install.d/99misc b/stage1/rootfs/aggregate/install.d/99misc
index b9d9fa1..9d9baf4 100644
--- a/stage1/rootfs/aggregate/install.d/99misc
+++ b/stage1/rootfs/aggregate/install.d/99misc
@@ -11,7 +11,7 @@ install -m 0644 units/sockets.target "$ROOT/usr/lib/systemd/system"
install -m 0755 scripts/reaper.sh "$ROOT"
install -d "$ROOT/etc"
-echo "rocket" > "$ROOT/etc/os-release"
+echo "rkt" > "$ROOT/etc/os-release"
# parent dir for the stage2 bind mounts
install -d "$ROOT/opt/stage2"
diff --git a/stage1/rootfs/aggregate/units/default.target b/stage1/rootfs/aggregate/units/default.target
index 6fe7fd4..9780282 100644
--- a/stage1/rootfs/aggregate/units/default.target
+++ b/stage1/rootfs/aggregate/units/default.target
@@ -1,3 +1,3 @@
[Unit]
-Description=Rocket apps target
+Description=rkt apps target
DefaultDependencies=false
diff --git a/stage1/rootfs/aggregate/units/reaper.service b/stage1/rootfs/aggregate/units/reaper.service
index 1cbd43d..41a7ce9 100644
--- a/stage1/rootfs/aggregate/units/reaper.service
+++ b/stage1/rootfs/aggregate/units/reaper.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Rocket apps reaper
+Description=rkt apps reaper
AllowIsolate=true
DefaultDependencies=false
diff --git a/stage1/rootfs/prepare-app/prepare-app.c b/stage1/rootfs/prepare-app/prepare-app.c
index f6aa55b..4eb3d83 100644
--- a/stage1/rootfs/prepare-app/prepare-app.c
+++ b/stage1/rootfs/prepare-app/prepare-app.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
/* Make stage2's root a mount point. Chrooting an application in a
* directory which is not a mount point is not nice because the
* application would not be able to remount "/" it as private mount.
- * This allows Docker to run inside Rocket.
+ * This allows Docker to run inside rkt.
* The recursive flag is to preserve volumes mounted previously by
* systemd-nspawn via "rkt run -volume".
* */
diff --git a/test b/test
index 050ec2f..374a8f0 100755
--- a/test
+++ b/test
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
-# Run all rocket tests
+# Run all rkt tests
# ./test
# ./test -v
#