diff --git a/.travis.yml b/.travis.yml index 36d1789..807cac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ stages: - lint - test env: - - CMD="docker run --rm -itv $(pwd):/src -w /src filebrowser/dev sh -c" + - CMD="docker run --rm -itv $(pwd):/go/src/github.com/filebrowser/caddy -w /go/src/github.com/filebrowser/caddy filebrowser/dev sh -c" jobs: include: - stage: lint diff --git a/build.sh b/build.sh index dfe7490..f9e1966 100644 --- a/build.sh +++ b/build.sh @@ -2,15 +2,8 @@ set -e -# Check if filebrowser exists but is empty (i.e., we are inside filebrowser/dev) -if [[ ! -d ../filebrowser/.git ]]; then - cd .. - rm -rf filebrowser - cd caddy -fi - go get -v ./... -cd ../../mholt/caddy/caddy +cd /go/src/github.com/mholt/caddy/caddy go get -v ./... go get -v github.com/caddyserver/builds sed -i.bak 's#// This is where other plugins get plugged in (imported)#_ "github.com/filebrowser/caddy"#' caddymain/run.go diff --git a/rice-box.go b/rice-box.go index 17542da..2edcd2a 100644 --- a/rice-box.go +++ b/rice-box.go @@ -1,4 +1,4 @@ -package http +package caddy import ( "time"