Merge pull request #61 from tetratelabs/getenvoy-image

use getenvoy org's image for ci

Author: mathetake

.github/workflows/workflow.yaml

@@ -53,7 +53,7 @@ jobs:
     needs: build-examples
     runs-on: ubuntu-latest
     container:
-      image: mathetake/proxy-wasm-go-ci:istio-${{ matrix.istio-version }}
+      image: getenvoy/proxy-wasm-go-sdk-ci:istio-${{ matrix.istio-version }}
     steps:
       - name: checkout
         uses: actions/checkout@v2

Makefile

@@ -1,5 +1,7 @@
 .DEFAULT_GOAL := build.examples
 
+ISTIO_VERSION ?= 1.7.2
+
 .PHONY: help build.example build.examples lint test test.sdk test.e2e
 help:
 	grep -E '^[a-z0-9A-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -17,10 +19,10 @@ test:
 	go test -tags=proxytest $(go list ./... | grep -v e2e | sed 's/github.com\/tetratelabs\/proxy-wasm-go-sdk/./g')
 
 test.e2e:
-	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go mathetake/proxy-wasm-go-ci:istio-1.7.2 go test ./e2e
+	docker run -it -w /tmp/proxy-wasm-go -v $(shell pwd):/tmp/proxy-wasm-go getenvoy/proxy-wasm-go-sdk-ci:istio-${ISTIO_VERSION} go test -v ./e2e
 
 run:
 	docker run --entrypoint='/usr/local/bin/envoy' \
 		-p 18000:18000 -p 8099:8099 \
-		-w /tmp/envoy -v $(shell pwd):/tmp/envoy istio/proxyv2:1.7.2 \
+		-w /tmp/envoy -v $(shell pwd):/tmp/envoy getenvoy/proxy-wasm-go-sdk-ci:istio-${ISTIO_VERSION} \
 		-c /tmp/envoy/examples/${name}/envoy.yaml --concurrency 2

e2e/Dockerfile

@@ -1,3 +1,20 @@
+# Copyright 2020 Tetrate
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# docker image for running e2e tests using istio/proxyv2 binary
+# TODO: build on GHA
+
 FROM istio/proxyv2:1.7.2
 
 FROM golang:1.15