diff --git a/backend/profiles.clj b/backend/profiles.clj index da49a2f79..90c9ae76c 100644 --- a/backend/profiles.clj +++ b/backend/profiles.clj @@ -8,4 +8,6 @@ {:jar-exclusions [#"\.swp|\.swo|user\.clj" #"^media"] :jar-name "uxbox.jar" :uberjar-name "uxbox-backend.jar" + :main uxbox.main + :aot :all :target-path "dist/"}} diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 1ca8e5aef..36fd754b6 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -198,6 +198,7 @@ gulp.task("dist:brotli", function() { gulp.task("dist", function(next) { runseq(["dist:clean"], ["dist:template", "dist:scss", "dist:copy"], - ["dist:gzip", "dist:brotli"], next); + //["dist:gzip", "dist:brotli"], + next); }); diff --git a/frontend/scripts/dist-main b/frontend/scripts/dist-main index 125569f58..41ff82401 100755 --- a/frontend/scripts/dist-main +++ b/frontend/scripts/dist-main @@ -5,10 +5,10 @@ LEIN="$DIR/lein" LEIN_FAST_TRAMPOLINE=y $LEIN trampoline run -m clojure.main scripts/dist-main.clj -if [ -x "$(command -v gzip)" ]; then - gzip -9c dist/js/main.js > dist/js/main.js.gz -fi - -if [ -x "$(command -v bro)" ]; then - bro --verbose --input dist/js/main.js --output dist/js/main.js.br -fi +#if [ -x "$(command -v gzip)" ]; then +# gzip -9c dist/js/main.js > dist/js/main.js.gz +#fi +# +#if [ -x "$(command -v bro)" ]; then +# bro --verbose --input dist/js/main.js --output dist/js/main.js.br +#fi diff --git a/frontend/scripts/dist-view b/frontend/scripts/dist-view index d844a967f..bceba374f 100755 --- a/frontend/scripts/dist-view +++ b/frontend/scripts/dist-view @@ -5,10 +5,10 @@ LEIN="$DIR/lein" LEIN_FAST_TRAMPOLINE=y $LEIN trampoline run -m clojure.main scripts/dist-view.clj -if [ -x "$(command -v gzip)" ]; then - gzip -9c dist/js/view.js > dist/js/view.js.gz -fi - -if [ -x "$(command -v bro)" ]; then - bro --verbose --input dist/js/view.js --output dist/js/view.js.br -fi +#if [ -x "$(command -v gzip)" ]; then +# gzip -9c dist/js/view.js > dist/js/view.js.gz +#fi +# +#if [ -x "$(command -v bro)" ]; then +# bro --verbose --input dist/js/view.js --output dist/js/view.js.br +#fi diff --git a/frontend/scripts/dist-worker b/frontend/scripts/dist-worker index 60ae48cbd..0f0239bd9 100755 --- a/frontend/scripts/dist-worker +++ b/frontend/scripts/dist-worker @@ -5,10 +5,10 @@ LEIN="$DIR/lein" LEIN_FAST_TRAMPOLINE=y $LEIN trampoline run -m clojure.main scripts/dist-worker.clj -if [ -x "$(command -v gzip)" ]; then - gzip -9c dist/js/worker.js > dist/js/worker.js.gz -fi - -if [ -x "$(command -v bro)" ]; then - bro --verbose --input dist/js/worker.js --output dist/js/worker.js.br -fi +#if [ -x "$(command -v gzip)" ]; then +# gzip -9c dist/js/worker.js > dist/js/worker.js.gz +#fi +# +#if [ -x "$(command -v bro)" ]; then +# bro --verbose --input dist/js/worker.js --output dist/js/worker.js.br +#fi diff --git a/manage.sh b/manage.sh index f9a77ead6..2d1581e39 100755 --- a/manage.sh +++ b/manage.sh @@ -4,8 +4,8 @@ REV=`git rev-parse --short HEAD` IMGNAME="uxbox" function kill_container { - if $(sudo docker ps |grep -q $IMGNAME); then - sudo docker ps |grep $IMGNAME | awk '{print $1}' | xargs --no-run-if-empty sudo docker kill + if $(sudo docker ps | grep -q $IMGNAME); then + sudo docker ps | grep $IMGNAME | awk '{print $1}' | xargs --no-run-if-empty sudo docker kill fi } @@ -17,7 +17,7 @@ function build_image { function run_image { kill_container - if ! $(sudo docker images|grep $IMGNAME |grep -q $REV); then + if ! $(sudo docker images | grep $IMGNAME | grep -q $REV); then build_image fi @@ -30,8 +30,25 @@ function run_image { -p 3449:3449 -p 6060:6060 -p 9090:9090 $IMGNAME:$REV } +function release_image { + cd frontend + rm -rf ./dist + npm run dist + ./scripts/dist-main + ./scripts/dist-view + ./scripts/dist-worker + echo "Frontend release generated in $(pwd)/dist" + + cd ../backend + rm -rf ./dist + ./scripts/dist + echo "Backend release generated in $(pwd)/dist" + + cd .. +} + function usage { - echo "USAGE: $0 [ build | run]" + echo "USAGE: $0 [ build | run | release ]" } case $1 in @@ -41,6 +58,9 @@ case $1 in run) run_image ;; + release) + release_image + ;; *) usage ;;