github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67673 from javier-b-perez/debian-iptables

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 67298, 67518, 67635, 67673). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

build/debian-iptables: make: support arguments for base and tag

**What this PR does / why we need it**:
Change debian-iptables makefile to support arguments for base image and tag.

**Special notes for your reviewer**:
Tested locally.

**Release note**:

```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-21 18:33:10 -07:00 committed by GitHub
commit 09cdfc5287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian-iptables/Makefile
View File

@ -16,11 +16,11 @@
REGISTRY?="staging-k8s.gcr.io"
IMAGE=debian-iptables
TAG=v10.1
TAG?=v10.1
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.3.2
build:
cp ./* $(TEMP_DIR)