opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 06:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16399 from Luap99/no-apk

Browse Source 
test/e2e: do not use apk in builds
This commit is contained in:
Daniel J Walsh
2022-11-04 06:50:19 -04:00
committed by GitHub
parent 013bd81417 4174901283
commit 017521c283
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/images_test.go
View File

@ -165,7 +165,7 @@ var _ = Describe("Podman images", func() {
It("podman images filter before image", func() { It("podman images filter before image", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest 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") podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false")
result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"}) result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"})

2
test/e2e/play_build_test.go
View File

@ -78,13 +78,11 @@ status: {}
var playBuildFile = ` var playBuildFile = `
FROM quay.io/libpod/alpine_nginx:latest FROM quay.io/libpod/alpine_nginx:latest
RUN apk update && apk add strace
LABEL homer=dad LABEL homer=dad
COPY copyfile /copyfile COPY copyfile /copyfile
` `
var prebuiltImage = ` var prebuiltImage = `
FROM quay.io/libpod/alpine_nginx:latest FROM quay.io/libpod/alpine_nginx:latest
RUN apk update && apk add strace
LABEL marge=mom LABEL marge=mom
` `

4
test/e2e/prune_test.go
View File

@ -13,8 +13,8 @@ import (
var pruneImage = fmt.Sprintf(` var pruneImage = fmt.Sprintf(`
FROM %s FROM %s
LABEL RUN podman --version LABEL RUN podman --version
RUN apk update RUN echo hello > /hello
RUN apk add bash`, ALPINE) RUN echo hello2 > /hello2`, ALPINE)
var emptyPruneImage = ` var emptyPruneImage = `
FROM scratch FROM scratch