kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-08-07 18:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set workdir also on step image

Browse Source 
Otherwise with DOCKER_SQUASH=true it wouldn't be coherent on where to
find the package files
This commit is contained in:
Ettore Di Giacinto 2020-11-28 12:04:14 +01:00
parent ca994b07ab
commit 44d33eceba
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/compiler/artifact_test.go
View File

@ -96,6 +96,7 @@ ENV PACKAGE_CATEGORY=app-admin`))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(dockerfile).To(Equal(` Expect(dockerfile).To(Equal(`
FROM luet/base FROM luet/base
WORKDIR /luetbuild
ENV PACKAGE_NAME=enman ENV PACKAGE_NAME=enman
ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_VERSION=1.4.0
ENV PACKAGE_CATEGORY=app-admin ENV PACKAGE_CATEGORY=app-admin

1
pkg/compiler/backend/simpledocker_test.go
View File

@ -87,6 +87,7 @@ ENV PACKAGE_CATEGORY=app-admin`))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(dockerfile).To(Equal(` Expect(dockerfile).To(Equal(`
FROM luet/base FROM luet/base
WORKDIR /luetbuild
ENV PACKAGE_NAME=enman ENV PACKAGE_NAME=enman
ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_VERSION=1.4.0
ENV PACKAGE_CATEGORY=app-admin ENV PACKAGE_CATEGORY=app-admin

1
pkg/compiler/spec.go
View File

@ -242,6 +242,7 @@ RUN ` + s
func (cs *LuetCompilationSpec) RenderStepImage(image string) (string, error) { func (cs *LuetCompilationSpec) RenderStepImage(image string) (string, error) {
spec := ` spec := `
FROM ` + image + ` FROM ` + image + `
WORKDIR /luetbuild
ENV PACKAGE_NAME=` + cs.Package.GetName() + ` ENV PACKAGE_NAME=` + cs.Package.GetName() + `
ENV PACKAGE_VERSION=` + cs.Package.GetVersion() + ` ENV PACKAGE_VERSION=` + cs.Package.GetVersion() + `
ENV PACKAGE_CATEGORY=` + cs.Package.GetCategory() ENV PACKAGE_CATEGORY=` + cs.Package.GetCategory()

2
pkg/compiler/spec_test.go
View File

@ -96,6 +96,7 @@ ENV test=1`))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(dockerfile).To(Equal(` Expect(dockerfile).To(Equal(`
FROM luet/base FROM luet/base
WORKDIR /luetbuild
ENV PACKAGE_NAME=enman ENV PACKAGE_NAME=enman
ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_VERSION=1.4.0
ENV PACKAGE_CATEGORY=app-admin ENV PACKAGE_CATEGORY=app-admin
@ -168,6 +169,7 @@ ENV test=1`))
Expect(dockerfile).To(Equal(` Expect(dockerfile).To(Equal(`
FROM luet/base FROM luet/base
WORKDIR /luetbuild
ENV PACKAGE_NAME=a ENV PACKAGE_NAME=a
ENV PACKAGE_VERSION=1.0 ENV PACKAGE_VERSION=1.0
ENV PACKAGE_CATEGORY=test ENV PACKAGE_CATEGORY=test