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
56083489
Commit
56083489
authored
Jun 17, 2015
by
Saad Ali
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9884 from brendandburns/gcr
Switch to loading busybox from gcr.
parents
641f8d47
9fda26e5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
services.sh
hack/e2e-suite/services.sh
+2
-2
persistent_volumes.go
test/e2e/persistent_volumes.go
+1
-1
pre_stop.go
test/e2e/pre_stop.go
+1
-1
No files found.
hack/e2e-suite/services.sh
View file @
56083489
...
...
@@ -280,8 +280,8 @@ function verify_from_container() {
echo
"waiting for
$1
at
$2
:
$3
"
results
=(
$(
ssh-to-node
"
${
test_node
}
"
"
set -e;
sudo docker pull busybox >/dev/null;
sudo docker run busybox sh -c '
sudo docker pull
gcr.io/google_containers/
busybox >/dev/null;
sudo docker run
gcr.io/google_containers/
busybox sh -c '
for i in
$(
seq
-s
' '
1
$((
$4
*
3
)))
; do
if wget -q -T 3 -O - http://
$2
:
$3
; then
echo
...
...
test/e2e/persistent_volumes.go
View file @
56083489
...
...
@@ -172,7 +172,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
Containers
:
[]
api
.
Container
{
{
Name
:
"scrub-checker"
,
Image
:
"busybox"
,
Image
:
"
gcr.io/google_containers/
busybox"
,
Command
:
[]
string
{
"/bin/sh"
},
Args
:
[]
string
{
"-c"
,
"test ! -e /mnt/index.html || exit 1"
},
VolumeMounts
:
[]
api
.
VolumeMount
{
...
...
test/e2e/pre_stop.go
View file @
56083489
...
...
@@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) {
Containers
:
[]
api
.
Container
{
{
Name
:
"tester"
,
Image
:
"busybox"
,
Image
:
"
gcr.io/google_containers/
busybox"
,
Command
:
[]
string
{
"sleep"
,
"600"
},
Lifecycle
:
&
api
.
Lifecycle
{
PreStop
:
&
api
.
Handler
{
...
...
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