github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

build: Fix base image versions on dependents

Browse Source 
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
Stephen Augustus 2020-05-01 17:59:30 -04:00
parent 99e6e06f5d
commit 410b388ad0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/debian-iptables/Makefile
View File

@ -16,13 +16,13 @@
REGISTRY?="staging-k8s.gcr.io" REGISTRY?="staging-k8s.gcr.io"
IMAGE=$(REGISTRY)/debian-iptables IMAGE=$(REGISTRY)/debian-iptables
TAG?=v12.0.2 TAG?=v12.0.1
ARCH?=amd64 ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASE_REGISTRY?=k8s.gcr.io BASE_REGISTRY?=k8s.gcr.io
BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.1 BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0
# This option is for running docker manifest command # This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled export DOCKER_CLI_EXPERIMENTAL := enabled

2
cluster/images/etcd-empty-dir-cleanup/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM k8s.gcr.io/debian-base:v1.0.0 FROM k8s.gcr.io/debian-base:v2.0.0
COPY etcdctl etcd-empty-dir-cleanup.sh / COPY etcdctl etcd-empty-dir-cleanup.sh /
RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh