kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-13 22:01:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup tests

Browse Source
This commit is contained in:
Ettore Di Giacinto
2021-10-24 02:00:58 +02:00
parent 063f704057
commit 819271b9bd
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/push.yml vendored
View File

@@ -14,8 +14,6 @@ jobs:
go-version: 1.16.x go-version: 1.16.x
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: setup-docker
uses: docker-practice/actions-setup-docker@0.0.1
- name: Login to quay - name: Login to quay
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
- name: Install deps - name: Install deps
@@ -40,8 +38,6 @@ jobs:
go-version: 1.16.x go-version: 1.16.x
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: setup-docker
uses: docker-practice/actions-setup-docker@0.0.1
- name: Login to quay - name: Login to quay
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
- name: Install deps - name: Install deps
@@ -66,8 +62,6 @@ jobs:
go-version: 1.16.x go-version: 1.16.x
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: setup-docker
uses: docker-practice/actions-setup-docker@0.0.1
- name: Login to quay - name: Login to quay
run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io run: echo ${{ secrets.DOCKER_TESTING_PASSWORD }} | sudo -E docker login -u ${{ secrets.DOCKER_TESTING_USERNAME }} --password-stdin quay.io
- name: Install deps - name: Install deps

25
pkg/api/core/image/delta_test.go
View File

@@ -54,30 +54,18 @@ var _ = Describe("Delta", func() {
var diff ImageDiff var diff ImageDiff
var err error 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() { BeforeEach(func() {
ctx = types.NewContext() ctx = types.NewContext()
tmpfile, err = ioutil.TempFile("", "delta") tmpfile, err = ioutil.TempFile("", "delta")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpfile.Name()) // clean up 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() { It("Extract all deltas", func() {
@@ -105,6 +93,7 @@ var _ = Describe("Delta", func() {
defer os.RemoveAll(tmpdir) // clean up defer os.RemoveAll(tmpdir) // clean up
Expect(file.Exists(filepath.Join(tmpdir, "usr", "local", "go"))).To(BeFalse()) 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() { It("Extract deltas and excludes /usr/local/go/bin, but includes /usr/local/go", func() {
_, tmpdir, err := Extract( _, tmpdir, err := Extract(
ctx, ctx,

8
pkg/installer/repository_docker.go
View File

@@ -200,17 +200,11 @@ func (d *dockerRepositoryGenerator) Generate(r *LuetSystemRepository, imagePrefi
if err != nil { if err != nil {
return errors.Wrapf(err, "while downloading '%s'", imageRepository) return errors.Wrapf(err, "while downloading '%s'", imageRepository)
} }
_, _, err = image.ExtractTo( _, _, err = image.ExtractTo(
d.context, d.context,
img, img,
repoTemp, repoTemp,
image.ExtractFiles( nil,
d.context,
"",
[]string{},
[]string{},
),
) )
if err != nil { if err != nil {
return errors.Wrapf(err, "while extracting '%s'", imageRepository) return errors.Wrapf(err, "while extracting '%s'", imageRepository)