Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ad8ea35d
Commit
ad8ea35d
authored
Jan 19, 2016
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update kubekins-test image to include netcat
parent
62bc09ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
gotest-dockerized.sh
hack/jenkins/gotest-dockerized.sh
+1
-1
Dockerfile
hack/jenkins/test-image/Dockerfile
+5
-1
Makefile
hack/jenkins/test-image/Makefile
+1
-1
No files found.
hack/jenkins/gotest-dockerized.sh
View file @
ad8ea35d
...
...
@@ -42,5 +42,5 @@ docker run --rm=true \
-v
"
${
REPO_DIR
}
"
:/go/src/k8s.io/kubernetes
\
-v
"
${
KUBE_JUNIT_REPORT_DIR
}
"
:/workspace/artifacts
\
--env
REPO_DIR
=
"
${
REPO_DIR
}
"
\
-i
gcr.io/google_containers/kubekins-test:0.
5
\
-i
gcr.io/google_containers/kubekins-test:0.
6
\
bash
-c
"cd kubernetes && ./hack/jenkins/test-dockerized.sh"
hack/jenkins/test-image/Dockerfile
View file @
ad8ea35d
...
...
@@ -24,8 +24,12 @@ ENV TERM xterm
WORKDIR
/workspace
RUN
apt-get
-o
Acquire::Check-Valid-Until
=
false
update
&&
apt-get
install
-y
rsync
# file is used when uploading test artifacts to GCS.
RUN
apt-get
install
-y
file
# libapparmor1 is needed for docker-in-docker.
RUN
apt-get
install
-y
file libapparmor1
RUN
apt-get
install
-y
libapparmor1
# netcat is used by integration test scripts.
RUN
apt-get
install
-y
netcat-openbsd
RUN
mkdir
-p
/go/src/k8s.io/kubernetes
RUN
ln
-s
/go/src/k8s.io/kubernetes /workspace/kubernetes
...
...
hack/jenkins/test-image/Makefile
View file @
ad8ea35d
all
:
push
TAG
=
0.
5
TAG
=
0.
6
container
:
docker build
-t
gcr.io/google_containers/kubekins-test .
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment