github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Add bash dependency to Redis e2e image
pull/564/head
Kubernetes Prow Robot 2019-02-28 11:51:46 -08:00 committed by GitHub
parent 2235a7e9a2 cf171f43eb
commit a3cace3aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/images/pets/redis-installer/Dockerfile
View File

@ -19,7 +19,7 @@ FROM BASEIMAGE
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/ CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
# TODO: just use standard redis when there is one for 3.2.0. # 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 # See README.md
RUN wget -qO /redis-3.2.0.tar.gz http://download.redis.io/releases/redis-3.2.0.tar.gz && \ 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 / COPY peer-finder /
ADD install.sh / ADD install.sh /
RUN chmod -c 755 /install.sh /on-start.sh /peer-finder RUN chmod -c 755 /install.sh /on-start.sh /peer-finder
Entrypoint ["/install.sh"] ENTRYPOINT ["/install.sh"]

2
test/images/pets/redis-installer/VERSION
View File

@ -1 +1 @@
1.2 1.3

2
test/images/pets/redis-installer/install.sh
View File

@ -1,4 +1,4 @@
#! /bin/bash #!/bin/bash
# Copyright 2016 The Kubernetes Authors. # Copyright 2016 The Kubernetes Authors.
# #

2
test/images/pets/zookeeper-installer/Dockerfile
View File

@ -30,4 +30,4 @@ RUN wget -q -O /zookeeper-3.5.0-alpha.tar.gz http://archive.apache.org/dist/zook
ADD install.sh / ADD install.sh /
RUN chmod -c 755 /install.sh /on-start.sh /peer-finder RUN chmod -c 755 /install.sh /on-start.sh /peer-finder
Entrypoint ["/install.sh"] ENTRYPOINT ["/install.sh"]