Skip to content

Commit

Permalink
Merge pull request #30 from devimust/fix-nodejs-gulp-build
Browse files Browse the repository at this point in the history
Fix nodejs gulp build
  • Loading branch information
devimust authored Dec 8, 2016
2 parents 1e2ccb6 + 6c95642 commit 4424859
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ public/fonts
public/js
public/views
vendor
VERSION
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install:

script:
- docker-compose run --rm composer install
- docker-compose run --rm npm install
- docker-compose run --rm npm -q install
- docker-compose run --rm gulp --production
- docker-compose run --rm artisan key:generate
- docker-compose run --rm phpunit
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ services:
volumes_from:
- app
npm:
image: rolckers/web-nodejs
image: rolckers/web-nodejs:4.6
command: --help
entrypoint:
- npm
volumes_from:
- app
gulp:
image: rolckers/web-nodejs
image: rolckers/web-nodejs:4.6
command: --help
entrypoint:
- gulp
Expand Down
19 changes: 16 additions & 3 deletions docker/create-rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,29 @@ if [ ! -d .git ]; then
exit 1
fi

if [ -z "$1" ]; then
echo "no version specified, please run with e.g. 'docker/create-rc.sh v1.0'"
exit 1
fi

if [ -f "$1.tar.gz" ]; then
echo "the file $1.tar.gz exist, please remove and try again"
exit 1
fi

docker-compose run --rm gulp --production

docker-compose run --rm phpunit

find ./storage -type 'f' | grep -v ".gitignore" | xargs rm -f

TIMESTAMP=$(date +%s)
TIMESTAMP=$(date)

echo "$1 created at $TIMESTAMP" >> ./VERSION

tar \
--owner=0 --group=0 \
-czf ./easy-bookmark-manager.$TIMESTAMP.tar.gz \
-czf ./$1.tar.gz \
app/ \
bootstrap/ \
config/ \
Expand All @@ -33,4 +45,5 @@ tar \
.htaccess \
artisan \
docker-compose.sample.yml \
server.php
server.php \
VERSION

0 comments on commit 4424859

Please sign in to comment.