From 73c0a04f76d425d4cfdc42e75b01fa088f9263a5 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Thu, 9 Jul 2020 12:31:23 -0700 Subject: [PATCH 1/2] version bumps from v1.18.4 to v1.18.5 --- Dockerfile | 2 +- Dockerfile.arm64 | 2 +- Dockerfile.windows | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec5170c..3654958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.4 +FROM gcr.io/google_containers/hyperkube:v1.18.5 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index c4aa98a..83ef9af 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/google_containers/hyperkube:v1.18.4 +FROM gcr.io/google_containers/hyperkube:v1.18.5 RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ apt-get update && apt-get upgrade -y && apt-get clean && \ clean-install apt-transport-https gnupg1 curl zfsutils-linux \ diff --git a/Dockerfile.windows b/Dockerfile.windows index 46aba42..a0a64e8 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -10,7 +10,7 @@ RUN if (-not (Get-Command Expand-7Zip -ErrorAction Ignore)) { \ Exit 1; \ } \ } -ENV K8S_VERSION v1.18.4 +ENV K8S_VERSION v1.18.5 RUN $URL = ('https://dl.k8s.io/{0}/kubernetes-node-windows-amd64.tar.gz' -f $env:K8S_VERSION); \ \ function Expand-GZip ($inFile, $outFile) { \ From cd827308a69fc4cd80e6588cd416999487f52307 Mon Sep 17 00:00:00 2001 From: Ryan Sanna Date: Thu, 9 Jul 2020 15:06:19 -0700 Subject: [PATCH 2/2] remove update-alternatives as new base image includes iptables-wrapper to determine mode --- Dockerfile | 5 ----- Dockerfile.arm64 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3654958..2b17da7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ glusterfs-common \ samba-common \ arptables - -RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ - update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ - update-alternatives --set arptables /usr/sbin/arptables-legacy && \ - update-alternatives --set ebtables /usr/sbin/ebtables-legacy diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 83ef9af..44fdfa7 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -17,8 +17,3 @@ RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \ glusterfs-common \ samba-common \ arptables - -RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \ - update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \ - update-alternatives --set arptables /usr/sbin/arptables-legacy && \ - update-alternatives --set ebtables /usr/sbin/ebtables-legacy