diff --git a/.travis.yml b/.travis.yml index a325df412..7a1e8bdf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,10 @@ before_install: - sudo apt-get install jq - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi) +# Print some things for debugging purposes... - echo $PR - echo $BRANCH +- echo `git rev-parse HEAD` # determine the docker image tag name ("nopush" being a placeholder to signify the image will not be pushed to dockerhub) - export DOCKER_TAG="nopush" - | @@ -32,6 +34,8 @@ before_install: if [ "$BRANCH" == "develop" ]; then export DOCKER_TAG="develop"; fi fi - echo $DOCKER_TAG + +install: # build docker image - docker build -t counterparty/counterwallet:$DOCKER_TAG --no-cache --build-arg TRANSIFEX_USER="$TRANSIFEX_USER" --build-arg TRANSIFEX_PASSWORD="$TRANSIFEX_PASSWORD" . diff --git a/Dockerfile b/Dockerfile index 16e7857f8..1932f1b75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,8 +74,9 @@ RUN if [ -n "$TRANSIFEX_USER" ] && [ -n "$TRANSIFEX_PASSWORD" ]; then echo "$TRA # Install project COPY . /counterwallet -WORKDIR /counterwallet RUN rm -rf /counterwallet/build +WORKDIR /counterwallet +RUN git rev-parse HEAD RUN npm -g install npm@latest RUN npm config set strict-ssl false ENV PHANTOMJS_CDNURL="http://cnpmjs.org/downloads"