Revert "Remove -release in filename when doing release build of proxy (…

…envoyproxy#704)" (envoyproxy#723)

Trying to fix post-submit failure

This reverts commit c04ec87.

BUILD

@@ -25,14 +25,6 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
-genrule(
-    name = "deb_version",
-    srcs = [],
-    outs = ["deb_version.txt"],
-    cmd = "echo $${ISTIO_VERSION:-\"0.3.0-dev\"} > \"$@\"",
-    visibility = ["//visibility:public"],
-)
-
 load("@io_bazel_rules_go//go:def.bzl", "go_prefix")
 
 go_prefix("istio.io/proxy")

script/push-debian.sh

@@ -23,6 +23,7 @@
 #   -p gs://istio-release/release/0.2.1/deb
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
+VERSION_FILE="${ROOT}/tools/deb/version"
 BAZEL_ARGS=""
 BAZEL_TARGET='//tools/deb:istio-proxy'
 BAZEL_BINARY="${ROOT}/bazel-bin/tools/deb/istio-proxy"
@@ -55,8 +56,10 @@ while getopts ":c:o:p:v:" arg; do
 done
 
 if [[ -n "${ISTIO_VERSION}" ]]; then
-  BAZEL_ARGS+=" --action_env=ISTIO_VERSION"
-  export ISTIO_VERSION
+  BAZEL_TARGET+='-release'
+  BAZEL_BINARY+='-release'
+  echo "${ISTIO_VERSION}" > "${VERSION_FILE}"
+  trap 'rm "${VERSION_FILE}"' EXIT
 fi
 
 [[ -z "${GCS_PATH}" ]] && [[ -z "${OUTPUT_DIR}" ]] && usage

tools/deb/BUILD

@@ -68,6 +68,20 @@ pkg_deb(
     maintainer = "The Istio Authors <istio-dev@googlegroups.com>",
     package = "istio-proxy",
     postinst = "postinst.sh",
+    version = "0.3-dev",
+)
+
+pkg_deb(
+    name = "istio-proxy-release",
+    architecture = "amd64",
+    built_using = "bazel",
+    conffiles_file = "conffiles",
+    data = ":debian-data",
+    description_file = "description",
+    homepage = "http://istio.io",
+    maintainer = "The Istio Authors <istio-dev@googlegroups.com>",
+    package = "istio-proxy",
+    postinst = "postinst.sh",
     tags = ["manual"],
-    version_file = "//:deb_version",
+    version_file = "version",
 )