Skip to content

Commit

Permalink
Merge pull request #38 from gondor/master
Browse files Browse the repository at this point in the history
Update go pathing
  • Loading branch information
gondor committed May 14, 2016
2 parents b23fe65 + 4b8f2cc commit a619617
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .goxc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"debs": {
"metadata": {
"description": "Docker Volume Plugin - Netshare",
"maintainer": "Jeremy Unruh (https://github.com/gondor)"
"maintainer": "Jeremy Unruh (https://github.com/ContainX)"
},
"metadata-deb": {
"Homepage": "https://github.com/gondor/docker-volume-netshare"
"Homepage": "https://github.com/ContainX/docker-volume-netshare"
},
"other-mapped-files": {
"/": "support/sysvinit-debian/"
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Docker NFS, AWS EFS & Samba/CIFS Volume Plugin

[![Build Status](https://travis-ci.org/gondor/docker-volume-netshare.svg)](https://travis-ci.org/gondor/docker-volume-netshare) [![release](http://github-release-version.herokuapp.com/github/gondor/docker-volume-netshare/release.svg?style=flat)](https://github.com/gondor/docker-volume-netshare/releases/latest)
[![Build Status](https://travis-ci.org/ContainX/docker-volume-netshare.svg)](https://travis-ci.org/ContainX/docker-volume-netshare) [![release](http://github-release-version.herokuapp.com/github/ContainX/docker-volume-netshare/release.svg?style=flat)](https://github.com/ContainX/docker-volume-netshare/releases/latest)

Mount NFS v3/4, AWS EFS or CIFS inside your docker containers. This is a docker plugin which enables these volume types to be directly mounted within a container.

### [http://netshare.containx.io](http://netshare.containx.io)

## NFS Prerequisites on Linux

NFS needs to be installed on Linux systems in order to properly mount NFS mounts.
Expand All @@ -21,13 +23,13 @@ sudo mount -t nfs4 1.1.1.1:/mountpoint /target/mount
#### From Source

```
$ go get github.com/gondor/docker-volume-netshare
$ go get github.com/ContainX/docker-volume-netshare
$ go build
```

#### From Binaries

Binaries are available through GitHub releases. You can download the appropriate binary, package and version from the [Releases](https://github.com/gondor/docker-volume-netshare/releases) page
Binaries are available through GitHub releases. You can download the appropriate binary, package and version from the [Releases](https://github.com/ContainX/docker-volume-netshare/releases) page

#### On Ubuntu / Debian

Expand All @@ -36,7 +38,7 @@ The method below will install the sysvinit and /etc/default options that can be
1. Install the Package

```
$ wget https://github.com/gondor/docker-volume-netshare/releases/download/v0.16/docker-volume-netshare_0.16_amd64.deb
$ wget https://github.com/ContainX/docker-volume-netshare/releases/download/v0.16/docker-volume-netshare_0.16_amd64.deb
$ sudo dpkg -i docker-volume-netshare_0.16_amd64.deb
```

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/gondor/docker-volume-netshare/netshare"
"github.com/ContainX/docker-volume-netshare/netshare"
)

var VERSION string = ""
Expand Down
2 changes: 1 addition & 1 deletion netshare/netshare.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
log "github.com/Sirupsen/logrus"
"github.com/docker/go-plugins-helpers/volume"
"github.com/gondor/docker-volume-netshare/netshare/drivers"
"github.com/ContainX/docker-volume-netshare/netshare/drivers"
"github.com/spf13/cobra"
"os"
"path/filepath"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[Unit]
Description=Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
<<<<<<< HEAD
Documentation=https://github.com/ContainX/docker-volume-netshare
After=nfs-utils.service docker.service
Requires=docker.service
=======
Documentation=https://github.com/gondor/docker-volume-netshare
After=nfs-utils.service
Before=docker.service
Requires=nfs-utils.service
>>>>>>> b23fe656606d7043631ecf7c5e8f60cbd3185972


[Service]
Expand Down
2 changes: 1 addition & 1 deletion vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"revisionTime": "2016-02-10T13:55:59Z"
}
],
"rootPath": "github.com/gondor/docker-volume-netshare"
"rootPath": "github.com/ContainX/docker-volume-netshare"
}

0 comments on commit a619617

Please sign in to comment.