Skip to content

Instantly share code, notes, and snippets.

@jamiehannaford
Created September 11, 2017 18:14
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jamiehannaford/9b7c4d7c27d54fab4373a0c459f408f0 to your computer and use it in GitHub Desktop.
Save jamiehannaford/9b7c4d7c27d54fab4373a0c459f408f0 to your computer and use it in GitHub Desktop.
$ git diff v1.5.0+coreos.0 v1.5.0
diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index ae860daac0..3a5f302856 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -31,7 +31,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
nfs-common \
glusterfs-client \
cifs-utils \
- ceph-common \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index cf06d6e327..fae40b8894 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -101,8 +101,6 @@ else
endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
- curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.3.1/calico
- chmod +x ${TEMP_DIR}/cni-bin/bin/calico
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
$ git diff v1.6.0+coreos.0 v1.6.0
diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index 86ae6a82c3..d5abe8a4fb 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -32,7 +32,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
nfs-common \
glusterfs-client \
cifs-utils \
- ceph-common \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 5f43dffd8b..1273c08019 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -111,8 +111,6 @@ else
endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
- curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.6.2/calico
- chmod +x ${TEMP_DIR}/cni-bin/bin/calico
docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
$ git diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index 6b4646bcc3..81eeb320d4 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -32,7 +32,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
nfs-common \
glusterfs-client \
cifs-utils \
- ceph-common \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 9537f58818..36bcb0f162 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -84,8 +84,6 @@ else
endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
- curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.9.1/calico
- chmod +x ${TEMP_DIR}/cni-bin/bin/calico
docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
$ git diff v1.7.3+coreos.0 v1.7.3
diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index 6b4646bcc3..81eeb320d4 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -32,7 +32,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
nfs-common \
glusterfs-client \
cifs-utils \
- ceph-common \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 9537f58818..36bcb0f162 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -84,8 +84,6 @@ else
endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
- curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.9.1/calico
- chmod +x ${TEMP_DIR}/cni-bin/bin/calico
docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"
$ git diff v1.8.0-beta.0+coreos.0 v1.8.0-beta.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment