Skip to content
This repository has been archived by the owner on Jul 19, 2024. It is now read-only.

Commit

Permalink
more tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
robby-d committed Jun 27, 2016
1 parent 65ac7a6 commit bcd22c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
- |
Expand All @@ -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" .

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit bcd22c1

Please sign in to comment.