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

test/e2e: do not use apk in builds #16399

Merged
merged 1 commit into from
Nov 4, 2022
Merged

test/e2e: do not use apk in builds #16399

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
2 changes: 1 addition & 1 deletion test/e2e/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ var _ = Describe("Podman images", func() {

It("podman images filter before image", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest
RUN apk update && apk add strace
RUN echo hello > /hello
`
podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false")
result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"})
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/play_build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,11 @@ status: {}

var playBuildFile = `
FROM quay.io/libpod/alpine_nginx:latest
RUN apk update && apk add strace
LABEL homer=dad
COPY copyfile /copyfile
`
var prebuiltImage = `
FROM quay.io/libpod/alpine_nginx:latest
RUN apk update && apk add strace
LABEL marge=mom
`

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/prune_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
var pruneImage = fmt.Sprintf(`
FROM %s
LABEL RUN podman --version
RUN apk update
RUN apk add bash`, ALPINE)
RUN echo hello > /hello
RUN echo hello2 > /hello2`, ALPINE)
Copy link
Member

Choose a reason for hiding this comment

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

This looks like a cut and paste error , ALPINE)

Copy link
Member

Choose a reason for hiding this comment

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

I think it's OK? That's the argument for the FROM %s in the sprintf()?


var emptyPruneImage = `
FROM scratch
Expand Down