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.

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

Jump to bottom

Explicitly ref. quay images for CI #4828

Merged
merged 1 commit into from Jun 5, 2023
Merged

Explicitly ref. quay images for CI #4828

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/conformance/README.md
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ First, pull base images used by various conformance tests:
bash
docker pull alpine
docker pull busybox
docker pull docker.io/library/centos:centos7
docker pull quay.io/libpod/centos:7
```

Then you can run all of the tests with go test:
Expand Down
1 change: 1 addition & 0 deletions tests/conformance/testdata/Dockerfile.edgecases
View file
Open in desktop
@@ -1,3 +1,4 @@
# Note: a registries.conf alias should redirect this to quay.io/libpod/busybox
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The word "should" is inherently ambiguous and should not be used in documentation (see what I did there?) In this instance, it's not clear whether you mean "we hope this happens", or "we know this will happen because there is an existing registries.conf mapping", or "we should some day set up a registries.conf mapping". This is fine to fix in the followup PR.

FROM busybox

MAINTAINER docker <docker@docker.io>
Expand Down
2 changes: 1 addition & 1 deletion tests/conformance/testdata/Dockerfile.reusebase
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM docker.io/library/centos:centos7 AS base
FROM quay.io/libpod/centos:7 AS base
RUN touch -t 201701261659.13 /1
ENV LOCAL=/1

Expand Down
2 changes: 1 addition & 1 deletion tests/conformance/testdata/Dockerfile.shell
View file
Open in desktop
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
SHELL ["/bin/bash", "-xc"]
RUN env
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copy/Dockerfile
View file
Open in desktop
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY script /usr/bin
RUN ls -al /usr/bin/script
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copydir/Dockerfile
View file
Open in desktop
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY dir /dir
RUN ls -al /dir/file
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copyrename/Dockerfile
View file
Open in desktop
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY file1 /usr/bin/file2
RUN ls -al /usr/bin/file2 && ! ls -al /usr/bin/file1
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copysymlink/Dockerfile
View file
Open in desktop
@@ -1,2 +1,2 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY file-link.tar.gz /
4 changes: 2 additions & 2 deletions tests/conformance/testdata/copysymlink/Dockerfile2
View file
Open in desktop
@@ -1,7 +1,7 @@
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY file.tar.gz /
RUN ln -s file.tar.gz file-link.tar.gz
RUN ls -l /file-link.tar.gz
FROM docker.io/library/centos:centos7
FROM quay.io/libpod/centos:7
COPY --from=0 /file-link.tar.gz /
RUN ls -l /file-link.tar.gz
2 changes: 1 addition & 1 deletion tests/test_buildah_rpm.sh
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ load helpers
skip_if_no_runtime

# Build a container to use for building the binaries.
image=docker.io/library/centos:centos7
image=quay.io/libpod/centos:7
cid=$(buildah from --pull --signature-policy ${TEST_SOURCES}/policy.json $image)
root=$(buildah mount $cid)
commit=$(git log --format=%H -n 1)
Expand Down