Release v1.1.0

scripts/consul-builder/Dockerfile

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

scripts/dist_build.sh

@@ -12,31 +12,31 @@ cd $DIR
 # Make sure build tools are available.
 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
 # web UI so it's ok that gets blown away as part of this.