status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Release v1.1.0

This commit is contained in:
Matt Keeler 2018-05-11 14:12:40 -04:00
parent 441c2a75c9
commit 34264245c2
No known key found for this signature in database
GPG Key ID: 51852D87348FFC4C
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/consul-builder/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:bionic FROM ubuntu:bionic
ENV GOVERSION 1.10 ENV GOVERSION 1.10.1
RUN apt-get update -y && \ RUN apt-get update -y && \
apt-get install --no-install-recommends -y -q \ apt-get install --no-install-recommends -y -q \

44
scripts/dist_build.sh
View File

@ -12,31 +12,31 @@ cd $DIR
# Make sure build tools are available. # Make sure build tools are available.
make tools make tools
# Build the standalone version of the web assets for the sanity check. # # Build the standalone version of the web assets for the sanity check.
pushd ui # pushd ui
bundle # bundle
make dist # make dist
popd # popd
pushd ui-v2 # pushd ui-v2
yarn install # yarn install
make dist # make dist
popd # popd
# Fixup the timestamps to match what's checked in. This will allow us to cleanly # # Fixup the timestamps to match what's checked in. This will allow us to cleanly
# verify that the checked-in content is up to date without spurious diffs of the # # verify that the checked-in content is up to date without spurious diffs of the
# file mod times. # # file mod times.
pushd pkg # pushd pkg
cat ../agent/bindata_assetfs.go | ../scripts/fixup_times.sh # cat ../agent/bindata_assetfs.go | ../scripts/fixup_times.sh
popd # popd
# Regenerate the built-in web assets. If there are any diffs after doing this # # Regenerate the built-in web assets. If there are any diffs after doing this
# then we know something is up. # # then we know something is up.
make static-assets # make static-assets
if ! git diff --quiet agent/bindata_assetfs.go; then # if ! git diff --quiet agent/bindata_assetfs.go; then
echo "Checked-in web assets are out of date, build aborted" # echo "Checked-in web assets are out of date, build aborted"
exit 1 # exit 1
fi # fi
# Now we are ready to do a clean build of everything. We no longer distribute the # Now we are ready to do a clean build of everything. We no longer distribute the
# web UI so it's ok that gets blown away as part of this. # web UI so it's ok that gets blown away as part of this.