Fix build info

.travis.yml

@@ -24,7 +24,7 @@ install: true
 script:
     - test -f "$DOCKER_DIR/image.tar" && docker load -i "$DOCKER_DIR/image.tar" || true
     - docker build -t core:build --target build .
-    - docker build -t core:dist --target dist .
+    - 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 testing .
     - 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

Dockerfile

@@ -30,14 +30,14 @@ RUN pip install -e .
 
 CMD ["unitd", "--control", "*:8080", "--no-daemon", "--log", "/dev/stdout"]
 
-ARG BRANCH_LABEL=NULL
-ARG COMMIT_HASH=0
-RUN docker/inject_build_info.sh $BRANCH_LABEL $COMMIT_HASH
+ARG VCS_BRANCH=NULL
+ARG VCS_COMMIT=NULL
+RUN docker/build_info.sh $VCS_BRANCH $VCS_COMMIT | tee /version.json
 
 
 FROM dist as testing
 
-RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community mongodb=3.4.4-r0
+RUN apk add --no-cache mongodb
 
 RUN pip install -r tests/requirements.txt
 

docker/inject_build_info.sh → docker/build_info.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 
 set -eu
-cat > version.json <<EOF
+
+cat <<EOF
 {
   "branch": "$1",
   "commit": "$2",
   "timestamp": "$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
 }
 EOF
-cat version.json

requirements.txt

@@ -2,7 +2,6 @@ django>=1.11.0,<1.12.0
 elasticsearch==5.3.0
 enum34==1.1.6
 git+https://github.com/flywheel-io/[email protected]#egg=gears
-ipython
 jsonschema==2.6.0
 markdown==2.6.5
 pymongo==3.2