From 7c3377cde67b35290c5249a8ecc1c408d0126a60 Mon Sep 17 00:00:00 2001
From: Yuval Kohavi <yuval.kohavi@gmail.com>
Date: Mon, 12 Oct 2020 11:43:33 -0400
Subject: [PATCH] fix gh binaries

---
 tools/wasme/changelog/v0.0.27.1/fixscripts.yaml    |  3 +++
 tools/wasme/cli/Makefile                           |  4 ++--
 tools/wasme/cli/ci/upload_github_release_assets.go |  2 +-
 tools/wasme/cli/docs/Makefile                      | 13 ++++++++++---
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 tools/wasme/changelog/v0.0.27.1/fixscripts.yaml

diff --git a/tools/wasme/changelog/v0.0.27.1/fixscripts.yaml b/tools/wasme/changelog/v0.0.27.1/fixscripts.yaml
new file mode 100644
index 00000000..e6fbc5df
--- /dev/null
+++ b/tools/wasme/changelog/v0.0.27.1/fixscripts.yaml
@@ -0,0 +1,3 @@
+changelog:
+  - type: NON_USER_FACING
+    description: fix CI scripts.
diff --git a/tools/wasme/cli/Makefile b/tools/wasme/cli/Makefile
index d802e4bb..f8874f2f 100644
--- a/tools/wasme/cli/Makefile
+++ b/tools/wasme/cli/Makefile
@@ -181,8 +181,8 @@ endif
 # Important to clean before pushing new releases. Dockerfiles and binaries may not update properly
 .PHONY: clean
 clean:
-	rm -rf  _output/
-	rm -rf  example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}
+	rm -rf _output/
+	rm -rf example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}
 
 .PHONY: build-example
 build-example:
diff --git a/tools/wasme/cli/ci/upload_github_release_assets.go b/tools/wasme/cli/ci/upload_github_release_assets.go
index d5974a0b..d12701c8 100644
--- a/tools/wasme/cli/ci/upload_github_release_assets.go
+++ b/tools/wasme/cli/ci/upload_github_release_assets.go
@@ -7,7 +7,7 @@ import (
 const buildDir = "_output"
 const installDir = "operator/install"
 const repoOwner = "solo-io"
-const repoName = "wasme"
+const repoName = "wasm"
 
 func main() {
 	assets := []githubutils.ReleaseAssetSpec{
diff --git a/tools/wasme/cli/docs/Makefile b/tools/wasme/cli/docs/Makefile
index 9319a894..abafe1aa 100644
--- a/tools/wasme/cli/docs/Makefile
+++ b/tools/wasme/cli/docs/Makefile
@@ -21,6 +21,13 @@ IMAGE_REPO := $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME)
 PRODUCT_SCOPE := web-assembly-hub
 DOCS_VERSION := latest
 
+
+ifdef WASME_USE_PODMAN
+	CONTAINERCLI := podman
+else
+	CONTAINERCLI := docker
+endif
+
 #----------------------------------------------------------------------------------
 # Docs
 #----------------------------------------------------------------------------------
@@ -79,10 +86,10 @@ SERVE_AS_LATEST_TAG:=$(VERSION)-latest
 ## don't bother generating manifest, just copy/modify from docs-prod repo
 # docker-push-docs: site-release manifest
 docker-push-docs: site-release
-	@echo "${GCR_PASSWORD}" | docker login -u ${GCR_USERNAME} --password-stdin gcr.io
-	docker build \
+	@echo "${GCR_PASSWORD}" | $(CONTAINERCLI) login -u ${GCR_USERNAME} --password-stdin gcr.io
+	$(CONTAINERCLI) build \
 		--build-arg VERSION=latest \
 		--build-arg PRODUCT_SCOPE=$(PRODUCT_SCOPE) \
 		--build-arg FROM_DIR=./site-latest \
 		-t $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG) .
-	docker push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)
+	$(CONTAINERCLI) push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)