Substantial cleanup

Author: gsfr

.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

CONTRIBUTING.md .github/CONTRIBUTING.mdCONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -2,12 +2,6 @@
 .*sw[op]
 *.py[co]
 *.egg-info
-/persistent
-/runtime
-bootstrap.json
-.cache
+
 /.coverage*
-coverage.xml
 /htmlcov
-node_modules/
-/bin/accesslog.csv

PULL_REQUEST_TEMPLATE.md .github/PULL_REQUEST_TEMPLATE.mdPULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -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

.gitignore

@@ -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"]