Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rice-box.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package http
package caddy

import (
"time"
Expand Down