github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34415 from colemickens/colemickens-hack-hyperkube

Browse Source 
Automatic merge from submit-queue

Fix hack/dev-push-hyperkube.sh

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: This fixes `hack/dev-push-hyperkube.sh`. It simplifies/standardizes its usage and fixes it for the changes to the build system.
This commit is contained in:
Kubernetes Submit Queue
2016-10-11 03:15:38 -07:00
committed by GitHub
parent 363d6ef934 5bcf1f8051
commit 894d8605dc
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/images/hyperkube/Dockerfile
View File

@@ -36,9 +36,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
RUN cp /usr/bin/nsenter /nsenter
# Copy the hyperkube binary
COPY hyperkube /hyperkube
# Manifests for the docker guide
COPY static-pods/master.json \
static-pods/etcd.json \
@@ -78,3 +75,7 @@ RUN ln -s /hyperkube /apiserver \
&& ln -s /hyperkube /kubelet \
&& ln -s /hyperkube /proxy \
&& ln -s /hyperkube /scheduler
# Copy the hyperkube binary
COPY hyperkube /hyperkube