mirror of https://github.com/istio/istio.io.git
Automator: update common-files@master in istio/istio.io@master (#6383)
This commit is contained in:
parent
55aaa89218
commit
fc86e93d4e
6
Makefile
6
Makefile
|
@ -28,6 +28,9 @@
|
|||
# figure out all the tools you need in your environment to make that work.
|
||||
export BUILD_WITH_CONTAINER ?= 0
|
||||
|
||||
# Version of image used within build container
|
||||
IMAGE_VERSION ?= master-2020-01-30T23-36-53
|
||||
|
||||
LOCAL_ARCH := $(shell uname -m)
|
||||
ifeq ($(LOCAL_ARCH),x86_64)
|
||||
TARGET_ARCH ?= amd64
|
||||
|
@ -60,7 +63,7 @@ export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
|
|||
export TARGET_OUT_LINUX = /work/out/linux_amd64
|
||||
CONTAINER_CLI ?= docker
|
||||
DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
|
||||
IMG ?= gcr.io/istio-testing/build-tools:master-2020-01-29T17-05-27
|
||||
IMG ?= gcr.io/istio-testing/build-tools:$(IMAGE_VERSION)
|
||||
UID = $(shell id -u)
|
||||
GID = `grep docker /etc/group | cut -f3 -d:`
|
||||
PWD = $(shell pwd)
|
||||
|
@ -108,6 +111,7 @@ RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):$(GID) --rm \
|
|||
-e TARGET_OUT="$(TARGET_OUT)" \
|
||||
-e TARGET_OUT_LINUX="$(TARGET_OUT_LINUX)" \
|
||||
-e USER="${USER}" \
|
||||
-e IMAGE_VERSION="$(IMAGE_VERSION)" \
|
||||
$(ENV_VARS) \
|
||||
-v /etc/passwd:/etc/passwd:ro \
|
||||
$(DOCKER_SOCKET_MOUNT) \
|
||||
|
|
|
@ -1 +1 @@
|
|||
3626b6a35a2333ee17c26a9897698fcf70fe4761
|
||||
3ea6773a213dabdc08ae93951a4769d98a695637
|
||||
|
|
|
@ -21,4 +21,4 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
golangci-lint run -c ./common/config/.golangci.yml
|
||||
golangci-lint run -v -c ./common/config/.golangci.yml
|
||||
|
|
Loading…
Reference in New Issue