Fix test image (#72)

This commit is contained in:
Vic Iglesias
2016-09-12 09:24:37 -07:00
committed by GitHub
parent ac7f133622
commit b8a64da78f
3 changed files with 8 additions and 8 deletions
+6 -6
View File
@@ -17,7 +17,7 @@ FROM debian:8.5
ENV CLOUDSDK_CORE_DISABLE_PROMPTS=1 \
PATH=/opt/google-cloud-sdk/bin:/opt/linux-amd64/:$PATH \
HELM_VERSION=canary \
HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
HELM_URL=https://storage.googleapis.com/kubernetes-charts-ci/helm/helm-canary-linux-amd64.tar.gz \
GOOGLE_CLOUD_SDK_VERSION=123.0.0 \
GOOGLE_PROJECT=kubernetes-charts-ci
@@ -30,10 +30,10 @@ RUN set -x \
&& tar xfv google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
&& ./google-cloud-sdk/install.sh \
&& gcloud components install kubectl \
&& gcloud config set project ${GOOGLE_PROJECT} \
&& wget -q ${HELM_URL} \
&& gcloud config set project ${GOOGLE_PROJECT}
RUN cd /opt && wget -q ${HELM_URL} \
&& tar xzfv helm-${HELM_VERSION}-linux-amd64.tar.gz \
&& apt-get -y purge wget localepurge \
RUN apt-get -y purge wget localepurge \
&& apt-get clean \
&& cd / \
&& rm -rf \
@@ -56,5 +56,5 @@ RUN set -x \
/usr/share/man/ \
/tmp/*
VOLUME ["/src"]
WORKDIR ["/src"]
VOLUME "/src"
WORKDIR "/src"
+1 -1
View File
@@ -18,7 +18,7 @@ set -o nounset
set -o pipefail
# TODO should we inject this. This is creating problems bumping the Docker version
IMAGE_VERSION="test-image:v1.6"
IMAGE_VERSION="test-image:v1.7"
CHART_ROOT=${CHART_ROOT:-$(git rev-parse --show-toplevel)}
IMAGE_NAME=${IMAGE_NAME:-"gcr.io/kubernetes-charts-ci/${IMAGE_VERSION}"}
+1 -1
View File
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
VERSION=v1.6
VERSION=v1.7
CONTAINER_NAME=test-image
usage() {