Initial updates while migrating

.travis.yml

@@ -6,7 +6,7 @@ go:
 
 sudo: false
 
-go_import_path: willnorris.com/go/imageproxy
+go_import_path: github.com/d3sw/imageproxy
 
 install:
  - # skip go get, which ensures all dependencies are vendored

Dockerfile

@@ -1,10 +1,10 @@
 FROM golang:1.9 as build
 MAINTAINER Will Norris <will@willnorris.com>
 
-WORKDIR /go/src/willnorris.com/go/imageproxy
+WORKDIR /go/src/github.com/d3sw/imageproxy
 ADD . .
 
-WORKDIR /go/src/willnorris.com/go/imageproxy/cmd/imageproxy
+WORKDIR /go/src/github.com/d3sw/imageproxy/cmd/imageproxy
 RUN go-wrapper download
 RUN CGO_ENABLED=0 GOOS=linux go-wrapper install
 

README.md

@@ -22,6 +22,11 @@ additional image adjustment options.
 [this post]: https://willnorris.com/2014/01/a-self-hosted-alternative-to-jetpacks-photon-service
 [atmos/camo]: https://github.com/atmos/camo
 
+## Deluxe Changes
+
+As this is forked project, this section details the scope of those changes, so that merging in changes will be easier
+
+* Package structure (willnorris.com/go/imageproxy -> github.com/d3sw/imageproxy)
 
 ## URL Structure ##
 
@@ -252,7 +257,7 @@ In most cases, you can follow the normal procedure for building a deploying any
 go application.  For example, I build it directly on my production debian server
 using:
 
- - `go build willnorris.com/go/imageproxy/cmd/imageproxy`
+ - `go build github.com/d3sw/imageproxy/cmd/imageproxy`
  - copy resulting binary to `/usr/local/bin`
  - copy [`etc/imageproxy.service`](etc/imageproxy.service) to
    `/lib/systemd/system` and enable using `systemctl`.

cmd/imageproxy/main.go

@@ -34,9 +34,9 @@ import (
 	"github.com/gregjones/httpcache/diskcache"
 	rediscache "github.com/gregjones/httpcache/redis"
 	"github.com/peterbourgon/diskv"
-	"willnorris.com/go/imageproxy"
-	"willnorris.com/go/imageproxy/internal/gcscache"
-	"willnorris.com/go/imageproxy/internal/s3cache"
+	"github.com/d3sw/imageproxy"
+	"github.com/d3sw/imageproxy/internal/gcscache"
+	"github.com/d3sw/imageproxy/internal/s3cache"
 )
 
 const defaultMemorySize = 100

imageproxy.go

@@ -14,7 +14,7 @@
 
 // Package imageproxy provides an image proxy server.  For typical use of
 // creating and using a Proxy, see cmd/imageproxy/main.go.
-package imageproxy // import "willnorris.com/go/imageproxy"
+package imageproxy // import "github.com/d3sw/imageproxy"
 
 import (
 	"bufio"
@@ -32,7 +32,7 @@ import (
 	"time"
 
 	"github.com/gregjones/httpcache"
-	tphttp "willnorris.com/go/imageproxy/third_party/http"
+	tphttp "github.com/d3sw/imageproxy/third_party/http"
 )
 
 // Proxy serves image requests.

vendor/vendor.json

@@ -833,5 +833,5 @@
 			"revisionTime": "2016-04-28T23:14:23Z"
 		}
 	],
-	"rootPath": "willnorris.com/go/imageproxy"
+	"rootPath": "github.com/d3sw/imageproxy"
 }