repo cleanup pt 2

shaobo322 · Jul 25, 2019 · 0dbe641 · 0dbe641
1 parent 02e33de
commit 0dbe641
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,6 @@ before_install:
   - docker build -t minikeyvalue -f Dockerfile .
 
 script:
-  - docker run --rm --hostname localhost minikeyvalue bash -c "go test -v lib_test.go lib.go"
+  - docker run --rm --hostname localhost minikeyvalue bash -c "go test -v src/lib_test.go src/lib.go"
   - docker run --rm --hostname localhost minikeyvalue bash -c "(./tools/bringup.sh &) && ./tools/test.py && go run tools/thrasher.go && ./tools/rtest.sh"
 
diff --git a/Dockerfile b/Dockerfile
@@ -23,6 +23,7 @@ ENV PATH ${PATH}:/mkv
 COPY requirements.txt mkv/requirements.txt
 RUN pip3 install --no-cache-dir -r mkv/requirements.txt
 
-COPY *.go rtest.sh bringup.sh mkv volume test.py mkv/
+COPY mkv volume mkv/
+COPY src/*.go mkv/src
 COPY tools/* mkv/tools/
 WORKDIR /mkv
diff --git a/mkv b/mkv
@@ -1,4 +1,4 @@
 #!/bin/bash -e
 go get github.com/syndtr/goleveldb/leveldb
-go run main.go lib.go server.go rebalance.go rebuild.go $@
+go run src/main.go src/lib.go src/server.go src/rebalance.go src/rebuild.go $@
 
diff --git a/lib.go → src/lib.go b/lib.go → src/lib.go
diff --git a/lib_test.go → src/lib_test.go b/lib_test.go → src/lib_test.go
diff --git a/main.go → src/main.go b/main.go → src/main.go
diff --git a/rebalance.go → src/rebalance.go b/rebalance.go → src/rebalance.go
diff --git a/rebuild.go → src/rebuild.go b/rebuild.go → src/rebuild.go
diff --git a/server.go → src/server.go b/server.go → src/server.go