diff --git a/.gitignore b/.gitignore index 12baf77..a560a9c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ public/fonts public/js public/views vendor +VERSION diff --git a/.travis.yml b/.travis.yml index fc72ab8..150bbaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml index 4026567..240eebe 100644 --- a/docker-compose.sample.yml +++ b/docker-compose.sample.yml @@ -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 diff --git a/docker/create-rc.sh b/docker/create-rc.sh index f266765..506c6a3 100755 --- a/docker/create-rc.sh +++ b/docker/create-rc.sh @@ -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/ \ @@ -33,4 +45,5 @@ tar \ .htaccess \ artisan \ docker-compose.sample.yml \ - server.php + server.php \ + VERSION