Merge pull request kubernetes#74648 from johscheuer/fix-redis-e2e-test-image

k8s-ci-robot · web-flow · commit a3cace3aa37c · 2019-02-28T11:51:46.000-08:00
Add bash dependency to Redis e2e image
diff --git a/test/images/pets/redis-installer/Dockerfile b/test/images/pets/redis-installer/Dockerfile
@@ -19,7 +19,7 @@ FROM BASEIMAGE
 CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
 
 # TODO: just use standard redis when there is one for 3.2.0.
-RUN clean-install wget make gcc libc-dev
+RUN clean-install wget make gcc libc-dev bash
 
 # See README.md
 RUN wget -qO /redis-3.2.0.tar.gz http://download.redis.io/releases/redis-3.2.0.tar.gz && \
@@ -37,4 +37,4 @@ ADD on-start.sh /
 COPY peer-finder /
 ADD install.sh /
 RUN chmod -c 755 /install.sh /on-start.sh /peer-finder
-Entrypoint ["/install.sh"]
+ENTRYPOINT ["/install.sh"]
diff --git a/test/images/pets/redis-installer/VERSION b/test/images/pets/redis-installer/VERSION
@@ -1 +1 @@
-1.2
+1.3
diff --git a/test/images/pets/redis-installer/install.sh b/test/images/pets/redis-installer/install.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # Copyright 2016 The Kubernetes Authors.
 #
diff --git a/test/images/pets/zookeeper-installer/Dockerfile b/test/images/pets/zookeeper-installer/Dockerfile
@@ -30,4 +30,4 @@ RUN wget -q -O /zookeeper-3.5.0-alpha.tar.gz http://archive.apache.org/dist/zook
 
 ADD install.sh /
 RUN chmod -c 755 /install.sh /on-start.sh /peer-finder
-Entrypoint ["/install.sh"]
+ENTRYPOINT ["/install.sh"]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#! /bin/bash`
	`1`	`+#!/bin/bash`
`2`	`2`
`3`	`3`	`# Copyright 2016 The Kubernetes Authors.`
`4`	`4`	`#`