mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
Add openssh-client to the debian-hyperkube-base image
This commit is contained in:
parent
1274902a3d
commit
71624d85fa
@ -20,20 +20,21 @@ FROM BASEIMAGE
|
|||||||
RUN ln -s /bin/sh /bin/bash
|
RUN ln -s /bin/sh /bin/bash
|
||||||
|
|
||||||
RUN echo CACHEBUST>/dev/null && clean-install \
|
RUN echo CACHEBUST>/dev/null && clean-install \
|
||||||
iptables \
|
ca-certificates \
|
||||||
|
ceph-common \
|
||||||
|
cifs-utils \
|
||||||
|
conntrack \
|
||||||
e2fsprogs \
|
e2fsprogs \
|
||||||
ebtables \
|
ebtables \
|
||||||
ethtool \
|
ethtool \
|
||||||
kmod \
|
|
||||||
ca-certificates \
|
|
||||||
conntrack \
|
|
||||||
util-linux \
|
|
||||||
socat \
|
|
||||||
git \
|
git \
|
||||||
jq \
|
|
||||||
nfs-common \
|
|
||||||
glusterfs-client \
|
glusterfs-client \
|
||||||
cifs-utils \
|
iptables \
|
||||||
ceph-common
|
jq \
|
||||||
|
kmod \
|
||||||
|
openssh-client \
|
||||||
|
nfs-common \
|
||||||
|
socat \
|
||||||
|
util-linux
|
||||||
|
|
||||||
COPY cni-bin/bin /opt/cni/bin
|
COPY cni-bin/bin /opt/cni/bin
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
REGISTRY?=gcr.io/google-containers
|
REGISTRY?=gcr.io/google-containers
|
||||||
IMAGE?=debian-hyperkube-base
|
IMAGE?=debian-hyperkube-base
|
||||||
TAG=0.5
|
TAG=0.6
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
CACHEBUST?=1
|
CACHEBUST?=1
|
||||||
|
|
||||||
|
@ -70,10 +70,10 @@ docker_pull(
|
|||||||
|
|
||||||
docker_pull(
|
docker_pull(
|
||||||
name = "debian-hyperkube-base-amd64",
|
name = "debian-hyperkube-base-amd64",
|
||||||
digest = "sha256:d216b425004fcb6d8047f74e81b30e7ead55f73e73511ca53a329c358786b6c9",
|
digest = "sha256:10546d592e58d5fdb2e25d79f291b8ac62c8d3a3d83337ad7309cca766dbebce",
|
||||||
registry = "gcr.io",
|
registry = "gcr.io",
|
||||||
repository = "google-containers/debian-hyperkube-base-amd64",
|
repository = "google-containers/debian-hyperkube-base-amd64",
|
||||||
tag = "0.5", # ignored, but kept here for documentation
|
tag = "0.6", # ignored, but kept here for documentation
|
||||||
)
|
)
|
||||||
|
|
||||||
docker_pull(
|
docker_pull(
|
||||||
|
@ -21,7 +21,7 @@ REGISTRY?=gcr.io/google-containers
|
|||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
|
HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
|
||||||
|
|
||||||
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.5
|
BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.6
|
||||||
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
Loading…
Reference in New Issue
Block a user