diff --git a/.travis.yml b/.travis.yml index 545bbee48..0ee69a50c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,9 @@ env: - NODE_VERSION=10.16.0 COMMAND=clean - NODE_VERSION=10.16.0 COMMAND=build-devenv #- NODE_VERSION=10.16.0 COMMAND=run-devenv + # TODO Add unit test command(s) #- NODE_VERSION=10.16.0 COMMAND=test - NODE_VERSION=10.16.0 COMMAND=build-release + - NODE_VERSION=10.16.0 COMMAND=build-release-frontend + - NODE_VERSION=10.16.0 COMMAND=build-release-backend - NODE_VERSION=10.16.0 COMMAND=run-release diff --git a/backend/scripts/prepare-release.sh b/backend/scripts/prepare-release.sh new file mode 100644 index 000000000..a247728c1 --- /dev/null +++ b/backend/scripts/prepare-release.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +rm -rf ../dist || exit 1; + +rsync -avr \ + --exclude="/test" \ + --exclude="/resources/public/media" \ + --exclude="/target" \ + --exclude="/scripts" \ + --exclude="/.*" \ + ../ ../dist/; diff --git a/docker/devenv/files/entrypoint.sh b/docker/devenv/files/entrypoint.sh index 419da3804..ceb79bc68 100644 --- a/docker/devenv/files/entrypoint.sh +++ b/docker/devenv/files/entrypoint.sh @@ -1,5 +1,5 @@ #!/usr/bin/env zsh set -e -echo "UXBOX Docker entrypoint initialization..." +echo "UXBOX Docker Dev entrypoint initialization..." exec "$@" diff --git a/manage.sh b/manage.sh index 81edd11ba..0a6e8c18d 100755 --- a/manage.sh +++ b/manage.sh @@ -51,13 +51,19 @@ function build-release-frontend-local { build-devenv fi + mkdir -p $HOME/.m2 + rm -rf ./frontend/node_modules + + CONTAINER=$IMGNAME:latest + + echo "Running development image $CONTAINER to build frontend release..." docker run -ti --rm \ -w /home/uxbox/uxbox/frontend \ -v `pwd`:/home/uxbox/uxbox \ -v $HOME/.m2:/home/uxbox/.m2 \ -e UXBOX_API_URL="/api" \ -e UXBOX_VIEW_URL="/view" \ - $IMGNAME:latest ./scripts/build-release.sh + $CONTAINER cd /home/uxbox/uxbox/frontend && ./scripts/build-release.sh } function build-release-frontend { @@ -69,6 +75,17 @@ function build-release-frontend { } function build-release-backend-local { + #if ! $(docker images | grep $IMGNAME | grep -q $REV); then + # build-devenv + #fi + #mkdir -p $HOME/.m2 + #CONTAINER=$IMGNAME:latest + #echo "Running development image $CONTAINER to build backend release..." + #docker run -ti --rm \ + # -w /home/uxbox/uxbox/backend \ + # -v `pwd`:/home/uxbox/uxbox \ + # -v $HOME/.m2:/home/uxbox/.m2 \ + # $CONTAINER cd /home/uxbox/uxbox/backend && ./scripts/prepare-release.sh rm -rf backend/dist || exit 1; rsync -avr \ --exclude="/test" \