这是indexloc提供的服务，不要输入任何密码
Skip to content

Update linuxserver image used in tests to one that is compatible with arm64 #5867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2023
Merged

Update linuxserver image used in tests to one that is compatible with arm64 #5867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/unit/git_4.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ teardown() {
}

@test "(git) git:from-image [normal]" {
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand All @@ -45,7 +45,7 @@ teardown() {
echo "status: $status"
assert_success

run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand Down Expand Up @@ -192,7 +192,7 @@ EOF
}

@test "(git) git:from-image labels correctly" {
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand All @@ -201,5 +201,5 @@ EOF
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "linuxserver/foldingathome:7.5.1-ls1"
assert_output_contains "linuxserver/foldingathome:7.6.21"
}
28 changes: 14 additions & 14 deletions tests/unit/git_7.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ setup() {
}

teardown() {
docker image rm linuxserver/foldingathome:7.5.1-ls1 || true
docker image rm linuxserver/foldingathome:7.6.21 || true
docker image rm dokku/node-js-getting-started:latest || true
docker image rm dokku-test/$TEST_APP:latest || true
docker image rm dokku-test/$TEST_APP:v2 || true
Expand All @@ -22,22 +22,22 @@ teardown() {
}

@test "(git) git:load-image [normal]" {
run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand All @@ -59,22 +59,22 @@ teardown() {
echo "status: $status"
assert_success

run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand Down Expand Up @@ -261,22 +261,22 @@ EOF
}

@test "(git) git:load-image labels correctly" {
run /bin/bash -c "docker image pull linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image pull linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image save -o /tmp/image.tar linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "docker image rm linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "docker image rm linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success

run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
run /bin/bash -c "cat /tmp/image.tar | dokku git:load-image $TEST_APP linuxserver/foldingathome:7.6.21"
echo "output: $output"
echo "status: $status"
assert_success
Expand All @@ -285,5 +285,5 @@ EOF
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "linuxserver/foldingathome:7.5.1-ls1"
assert_output_contains "linuxserver/foldingathome:7.6.21"
}