mirror of
https://github.com/mudler/luet.git
synced 2025-09-13 22:01:39 +00:00
Fixup tests
This commit is contained in:
6
.github/workflows/push.yml
vendored
6
.github/workflows/push.yml
vendored
@@ -14,8 +14,6 @@ jobs:
|
||||
go-version: 1.16.x
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: setup-docker
|
||||
uses: docker-practice/actions-setup-docker@0.0.1
|
||||
- name: Login to quay
|
||||
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
|
||||
- name: Install deps
|
||||
@@ -40,8 +38,6 @@ jobs:
|
||||
go-version: 1.16.x
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: setup-docker
|
||||
uses: docker-practice/actions-setup-docker@0.0.1
|
||||
- name: Login to quay
|
||||
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
|
||||
- name: Install deps
|
||||
@@ -66,8 +62,6 @@ jobs:
|
||||
go-version: 1.16.x
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: setup-docker
|
||||
uses: docker-practice/actions-setup-docker@0.0.1
|
||||
- name: Login to quay
|
||||
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
|
||||
- name: Install deps
|
||||
|
@@ -54,30 +54,18 @@ var _ = Describe("Delta", func() {
|
||||
var diff ImageDiff
|
||||
var err error
|
||||
|
||||
ref, _ = name.ParseReference("alpine")
|
||||
ref2, _ = name.ParseReference("golang:alpine")
|
||||
img, _ = daemon.Image(ref)
|
||||
img2, _ = daemon.Image(ref2)
|
||||
diff, err = Delta(img, img2)
|
||||
|
||||
BeforeEach(func() {
|
||||
ctx = types.NewContext()
|
||||
|
||||
tmpfile, err = ioutil.TempFile("", "delta")
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
defer os.RemoveAll(tmpfile.Name()) // clean up
|
||||
|
||||
ref, err = name.ParseReference("alpine")
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
|
||||
ref2, err = name.ParseReference("golang:alpine")
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
|
||||
img, err = daemon.Image(ref)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
img2, err = daemon.Image(ref2)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
|
||||
diff, err = Delta(img, img2)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
|
||||
Expect(len(diff.Additions) > 0).To(BeTrue())
|
||||
Expect(len(diff.Changes) > 0).To(BeTrue())
|
||||
Expect(len(diff.Deletions) == 0).To(BeTrue())
|
||||
})
|
||||
|
||||
It("Extract all deltas", func() {
|
||||
@@ -105,6 +93,7 @@ var _ = Describe("Delta", func() {
|
||||
defer os.RemoveAll(tmpdir) // clean up
|
||||
Expect(file.Exists(filepath.Join(tmpdir, "usr", "local", "go"))).To(BeFalse())
|
||||
})
|
||||
|
||||
It("Extract deltas and excludes /usr/local/go/bin, but includes /usr/local/go", func() {
|
||||
_, tmpdir, err := Extract(
|
||||
ctx,
|
||||
|
@@ -200,17 +200,11 @@ func (d *dockerRepositoryGenerator) Generate(r *LuetSystemRepository, imagePrefi
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "while downloading '%s'", imageRepository)
|
||||
}
|
||||
|
||||
_, _, err = image.ExtractTo(
|
||||
d.context,
|
||||
img,
|
||||
repoTemp,
|
||||
image.ExtractFiles(
|
||||
d.context,
|
||||
"",
|
||||
[]string{},
|
||||
[]string{},
|
||||
),
|
||||
nil,
|
||||
)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "while extracting '%s'", imageRepository)
|
||||
|
Reference in New Issue
Block a user