Substantial cleanup

scitran · Jan 11, 2018 · b163af1 · b163af1
1 parent 9458f7f
commit b163af1
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 227 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,15 +1,8 @@
 .git
+**/.DS_Store
+**/.*sw[op]
+**/*.py[co]
+**/*.egg-info
 
-# --- Below Should mirror .gitignore, without leading '/' --- #
-.DS_Store
-.*sw[op]
-*.py[co]
-*.egg-info
-persistent
-runtime
-bootstrap.json
-.cache
-.coverage*
-coverage.xml
-htmlcov
-node_modules
+/.coverage*
+/htmlcov
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,6 @@
 .*sw[op]
 *.py[co]
 *.egg-info
-/persistent
-/runtime
-bootstrap.json
-.cache
+
 /.coverage*
-coverage.xml
 /htmlcov
-node_modules/
-/bin/accesslog.csv
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ script:
     - docker build -t core:dist --target dist --build-arg VCS_BRANCH="$TRAVIS_BRANCH" --build-arg VCS_COMMIT="$TRAVIS_COMMIT" .
     - docker build -t core:testing --target dev .
     - docker save -o "$DOCKER_DIR/image.tar" $(docker history -q core:build | grep -v '<missing>') $(docker history -q core:dist | grep -v '<missing>')
-    - ./tests/bin/run-tests-docker.sh --image core:testing
+    - ./tests/bin/docker-tests.sh --image core:testing
 
 after_success:
     - if [ "$TRAVIS_TAG" ]; then

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ VOLUME /data/persistent
 WORKDIR /src/core
 ENV SCITRAN_PERSISTENT_DATA_PATH=/data/persistent
 
-COPY docker/unit.json /var/local/unit/conf.json
+COPY nginx-unit.json /var/local/unit/conf.json
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
@@ -33,9 +33,9 @@ RUN pip install -e .
 
 ARG VCS_BRANCH=NULL
 ARG VCS_COMMIT=NULL
-RUN docker/build_info.sh $VCS_BRANCH $VCS_COMMIT | tee /version.json
+RUN ./bin/build_info.sh $VCS_BRANCH $VCS_COMMIT | tee /version.json
 
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["./bin/entrypoint.sh"]
 CMD ["unitd", "--control", "*:8080", "--no-daemon", "--log", "/dev/stdout"]
 
 
@@ -47,4 +47,4 @@ RUN apk add --no-cache mongodb
 
 RUN pip install -r tests/requirements.txt
 
-CMD ["./docker/dev+mongo.sh"]
+CMD ["./bin/dev+mongo.sh"]
diff --git a/docker/build_info.sh → bin/build_info.sh b/docker/build_info.sh → bin/build_info.sh
diff --git a/docker/dev+mongo.sh → bin/dev+mongo.sh b/docker/dev+mongo.sh → bin/dev+mongo.sh
diff --git a/entrypoint.sh → bin/entrypoint.sh b/entrypoint.sh → bin/entrypoint.sh
diff --git a/bootstrap.sample.json b/bootstrap.sample.json
diff --git a/docker/README.md b/docker/README.md
diff --git a/docker/bootstrap-accounts.sh b/docker/bootstrap-accounts.sh
diff --git a/docker/bootstrap-data.sh b/docker/bootstrap-data.sh
diff --git a/docker/pymongo-cli.py b/docker/pymongo-cli.py
diff --git a/docker/unit.json → nginx-unit.json b/docker/unit.json → nginx-unit.json
diff --git a/TESTING.md → tests/README.md b/TESTING.md → tests/README.md
diff --git a/tests/bin/run-tests-docker.sh → tests/bin/docker-tests.sh b/tests/bin/run-tests-docker.sh → tests/bin/docker-tests.sh
@@ -17,7 +17,7 @@ Options:
 
     -B, --no-build      Skip rebuilding default Docker image
     --image IMAGE       Use custom Docker image
-    -- TEST_ARGS        Arguments passed to tests/bin/run-tests-ubuntu.sh
+    -- TEST_ARGS        Arguments passed to tests/bin/tests.sh
 
 "
 
@@ -89,7 +89,7 @@ main() {
         --env SCITRAN_PERSISTENT_DB_URI=mongodb://core-test-service:27017/scitran \
         --env SCITRAN_PERSISTENT_DB_LOG_URI=mongodb://core-test-service:27017/logs \
         scitran/core:testing \
-        tests/bin/run-tests-ubuntu.sh $TEST_ARGS
+        tests/bin/tests.sh $TEST_ARGS
 }
 
 

diff --git a/tests/bin/run-tests-ubuntu.sh → tests/bin/tests.sh b/tests/bin/run-tests-ubuntu.sh → tests/bin/tests.sh