mirror of https://github.com/k3s-io/k3s
Merge pull request #30556 from ixdy/kubekins-test-bc
Automatic merge from submit-queue Install bc in the kubekins-test image I finally figured out those ``` /dev/fd/63: line 124: bc: command not found /dev/fd/63: line 125: bc: command not found ``` lines that keep appearing in build logs. Image is not yet pushed.pull/6/head
commit
874a186932
|
@ -61,5 +61,5 @@ docker run --rm=true -i \
|
|||
-e "WORKSPACE=/workspace" \
|
||||
${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
|
||||
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \
|
||||
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev2 \
|
||||
gcr.io/google_containers/kubekins-test:go1.6.3-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')"
|
||||
|
|
|
@ -45,5 +45,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.3-docker1.9.1-rev2 \
|
||||
-i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \
|
||||
bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"
|
||||
|
|
|
@ -26,12 +26,14 @@ ENV DOCKER_VERSION 1.9.1
|
|||
|
||||
WORKDIR /workspace
|
||||
|
||||
# bc is needed by shell2junit
|
||||
# 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
|
||||
# python-pip is needed to install the AWS cli.
|
||||
# netcat is used by integration test scripts.
|
||||
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
|
||||
bc \
|
||||
dnsutils \
|
||||
file \
|
||||
jq \
|
||||
|
|
|
@ -16,7 +16,7 @@ all: push
|
|||
|
||||
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
|
||||
# These versions are specified in the Dockerfile
|
||||
TAG = go1.6.3-docker1.9.1-rev2
|
||||
TAG = go1.6.3-docker1.9.1-rev3
|
||||
|
||||
container:
|
||||
docker build -t gcr.io/google_containers/kubekins-test .
|
||||
|
|
Loading…
Reference in New Issue