diff --git a/admin/.gitignore b/admin/.gitignore index 3499f2018..51903793e 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -19,3 +19,4 @@ artifacts *.iml .idea +BUILD_NUMBER diff --git a/admin/build b/admin/build index 620aacba9..c464e9be3 100755 --- a/admin/build +++ b/admin/build @@ -59,6 +59,7 @@ module JamAdmin end EOF + echo "$BUILD_NUMBER" > BUILD_NUMBER type -P dpkg-architecture > /dev/null @@ -79,7 +80,7 @@ EOF bundle exec rake assets:precompile RAILS_ENV=production # create debian using fpm - bundle exec fpm -s dir -t deb -p target/deb/jam-admin_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-admin" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-admin --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app + bundle exec fpm -s dir -t deb -p target/deb/jam-admin_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-admin" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-admin --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app BUILD_NUMBER fi diff --git a/admin/script/package/upstart-run.sh b/admin/script/package/upstart-run.sh index 51bb64f4a..412b9efa7 100755 --- a/admin/script/package/upstart-run.sh +++ b/admin/script/package/upstart-run.sh @@ -2,7 +2,7 @@ # default config values PORT=3000 -BUILD_NUMBER=1 +BUILD_NUMBER=`cat /var/lib/jam-admin/BUILD_NUMBER` CONFIG_FILE="/etc/jam-admin/upstart.conf" diff --git a/web/.gitignore b/web/.gitignore index 619997531..48289754a 100644 --- a/web/.gitignore +++ b/web/.gitignore @@ -37,3 +37,4 @@ vendor/cache public/assets public/uploads /log/*.out +BUILD_NUMBER diff --git a/web/build b/web/build index 0b76e35f0..070663bc6 100755 --- a/web/build +++ b/web/build @@ -103,6 +103,7 @@ module JamWeb end EOF + echo "$BUILD_NUMBER" > BUILD_NUMBER type -P dpkg-architecture > /dev/null @@ -123,7 +124,7 @@ EOF bundle exec rake assets:precompile RAILS_ENV=production # create debian using fpm - bundle exec fpm -s dir -t deb -p target/deb/jam-web_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-web" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-web --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app + bundle exec fpm -s dir -t deb -p target/deb/jam-web_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "jam-web" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/jam-web --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile .bundle config Rakefile script config.ru lib public vendor app BUILD_NUMBER fi diff --git a/web/script/package/upstart-run.sh b/web/script/package/upstart-run.sh index 44317db99..7f1d35fa0 100755 --- a/web/script/package/upstart-run.sh +++ b/web/script/package/upstart-run.sh @@ -2,7 +2,7 @@ # default config values PORT=3000 -BUILD_NUMBER=1 +BUILD_NUMBER=`cat /var/lib/jam-web/BUILD_NUMBER` CONFIG_FILE="/etc/jam-web/upstart.conf" diff --git a/websocket-gateway/.gitignore b/websocket-gateway/.gitignore index 50ce4204c..659252d4d 100644 --- a/websocket-gateway/.gitignore +++ b/websocket-gateway/.gitignore @@ -23,3 +23,4 @@ log/* *.iml target vendor +BUILD_NUMBER diff --git a/websocket-gateway/build b/websocket-gateway/build index b2dfa2c7c..2eb3b7f23 100755 --- a/websocket-gateway/build +++ b/websocket-gateway/build @@ -45,7 +45,9 @@ if [ -n "$PACKAGE" ]; then echo "BUILD NUMBER is not defined" exit 1 fi - + + echo "$BUILD_NUMBER" > BUILD_NUMBER + type -P dpkg-architecture > /dev/null if [ "$?" = "0" ]; then @@ -60,7 +62,7 @@ if [ -n "$PACKAGE" ]; then bundle install --path vendor/bundle --local # create debian using fpm - bundle exec fpm -s dir -t deb -p target/deb/websocket-gateway_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "websocket-gateway" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/websocket-gateway --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile lib bin vendor .bundle config script + bundle exec fpm -s dir -t deb -p target/deb/websocket-gateway_0.1.${BUILD_NUMBER}_${ARCH}.deb -n "websocket-gateway" -v "0.1.$BUILD_NUMBER" --prefix /var/lib/websocket-gateway --after-install $DIR/script/package/post-install.sh --before-install $DIR/script/package/pre-install.sh --before-remove $DIR/script/package/pre-uninstall.sh --after-remove $DIR/script/package/post-uninstall.sh Gemfile lib bin vendor .bundle config script BUILD_NUMBER fi diff --git a/websocket-gateway/script/package/upstart-run.sh b/websocket-gateway/script/package/upstart-run.sh index af5cbee66..11ffffb06 100755 --- a/websocket-gateway/script/package/upstart-run.sh +++ b/websocket-gateway/script/package/upstart-run.sh @@ -1,7 +1,7 @@ #!/bin/bash -l # default config values -BUILD_NUMBER=1 +BUILD_NUMBER=`cat /var/lib/websocket-gateway/BUILD_NUMBER` CONFIG_FILE="/etc/websocket-gateway/upstart.conf" if [ -e "$CONFIG_FILE" ]; then