From 90053e34e2f6ee0f33e27c708490ed169c3b747b Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Fri, 28 Oct 2016 13:08:57 -0700 Subject: [PATCH] Add netbase package to gci mounter container image Signed-off-by: Vishnu Kannan --- cluster/gce/gci/mounter/Changelog | 4 ++++ cluster/gce/gci/mounter/Dockerfile | 2 +- cluster/gce/gci/mounter/Makefile | 2 +- cluster/gce/gci/mounter/mounter | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cluster/gce/gci/mounter/Changelog b/cluster/gce/gci/mounter/Changelog index 69a5ae874d4..ced9cdd097d 100644 --- a/cluster/gce/gci/mounter/Changelog +++ b/cluster/gce/gci/mounter/Changelog @@ -1,3 +1,7 @@ ## v1 (Thu Oct 20 2016 Vishnu Kannan ) - Creating a container with mount tools pre-installed - Digest: sha256:9b3c1f04ad6b8947af4eb98f1eff2dc54c5664e3469b4cdf722ec5dd2a1dc064 + +## v2 (Fri Oct 28 2016 Vishnu Kannan ) + - Adding netbase package. + - Digest: sha256:c7dfe059fbbf976fc4284a87eb18adf0f8e0c4cf30a30f5a852842c772a64c2d diff --git a/cluster/gce/gci/mounter/Dockerfile b/cluster/gce/gci/mounter/Dockerfile index 27c2bd4459a..bfdc3f6b7da 100644 --- a/cluster/gce/gci/mounter/Dockerfile +++ b/cluster/gce/gci/mounter/Dockerfile @@ -15,6 +15,6 @@ FROM ubuntu:xenial MAINTAINER vishh@google.com -RUN apt-get update && apt-get install -y nfs-common=1:1.2.8-9ubuntu12 glusterfs-client=3.7.6-1ubuntu1 +RUN apt-get update && apt-get install -y netbase nfs-common=1:1.2.8-9ubuntu12 glusterfs-client=3.7.6-1ubuntu1 ENTRYPOINT ["/bin/mount"] diff --git a/cluster/gce/gci/mounter/Makefile b/cluster/gce/gci/mounter/Makefile index 4581cb35f63..2cc4eaa43c1 100644 --- a/cluster/gce/gci/mounter/Makefile +++ b/cluster/gce/gci/mounter/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -TAG=v1 +TAG=v2 REGISTRY=gcr.io/google_containers IMAGE=gci-mounter diff --git a/cluster/gce/gci/mounter/mounter b/cluster/gce/gci/mounter/mounter index 4c80eb566f9..d981cc6fee1 100755 --- a/cluster/gce/gci/mounter/mounter +++ b/cluster/gce/gci/mounter/mounter @@ -18,7 +18,7 @@ set -e set -o pipefail MOUNTER_DOCKER_IMAGE=gcr.io/google_containers/gci-mounter -MOUNTER_DOCKER_VERSION=v1 +MOUNTER_DOCKER_VERSION=v2 MOUNTER_USER=root RKT_BINARY=/home/kubernetes/bin/rkt