luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Runs the static asset packaging inside the container; updates assets.

This commit is contained in:
James Phillips 2016-11-08 15:14:08 -08:00
parent 21c94a956b
commit e01fde4007
No known key found for this signature in database
GPG Key ID: 77183E682AC5FC11
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -59,7 +59,8 @@ vet:
echo "and fix them if necessary before submitting the code for reviewal."; \ echo "and fix them if necessary before submitting the code for reviewal."; \
fi fi
# build the static web ui # build the static web ui and build static assets inside a Docker container, the
# same way a release build works
ui: ui:
@sh -c "'$(CURDIR)/scripts/ui.sh'" @sh -c "'$(CURDIR)/scripts/ui.sh'"

32
command/agent/bindata_assetfs.go
View File

File diff suppressed because one or more lines are too long

6
scripts/ui_build.sh
View File

@ -9,10 +9,16 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
# Change into that dir because we expect that. # Change into that dir because we expect that.
cd $DIR cd $DIR
# Make sure build tools are available.
make tools
# Build the web assets. # Build the web assets.
pushd ui pushd ui
bundle bundle
make dist make dist
popd popd
# Make the static assets using the container version of the builder
make static-assets
exit 0 exit 0