Cleanup hack/ Dockerfiles

Signed-off-by: Jess Frazelle <jessfraz@google.com>
This commit is contained in:
Jess Frazelle
2016-06-22 14:34:01 -07:00
committed by Jess Frazelle
parent c0579af684
commit 5e03b743d6
6 changed files with 36 additions and 30 deletions

View File

@@ -61,5 +61,5 @@ docker run --rm=true -i \
-e "WORKSPACE=/workspace" \
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \
"${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \
gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"

View File

@@ -44,5 +44,5 @@ docker run --rm=true \
-e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
-e "REPO_DIR=${REPO_DIR}" \
-e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
-i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"

View File

@@ -28,22 +28,23 @@ WORKDIR /workspace
# dnsutils is needed by federation cluster scripts.
# file is used when uploading test artifacts to GCS.
# jq is used by hack/verify-godep-licenses.sh.
# jq is used by hack/verify-godep-licenses.sh
# python-pip is needed to install the AWS cli.
# netcat is used by integration test scripts.
RUN apt-get update && apt-get install -y \
dnsutils \
file \
jq \
python-pip \
netcat-openbsd \
rsync \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
dnsutils \
file \
jq \
python-pip \
netcat-openbsd \
rsync \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\
tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
RUN mkdir -p /go/src/k8s.io/kubernetes
RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
RUN mkdir -p /go/src/k8s.io/kubernetes \
&& ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
RUN /bin/bash

View File

@@ -16,7 +16,7 @@ all: push
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# These versions are specified in the Dockerfile
TAG = go1.6.2-docker1.9.1-rev2
TAG = go1.6.2-docker1.9.1-rev3
container:
docker build -t gcr.io/google_containers/kubekins-test .