diff --git a/pkg/compiler/artifact_test.go b/pkg/compiler/artifact_test.go index 39fbdebf..047fa2a3 100644 --- a/pkg/compiler/artifact_test.go +++ b/pkg/compiler/artifact_test.go @@ -96,6 +96,7 @@ ENV PACKAGE_CATEGORY=app-admin`)) Expect(err).ToNot(HaveOccurred()) Expect(dockerfile).To(Equal(` FROM luet/base +WORKDIR /luetbuild ENV PACKAGE_NAME=enman ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_CATEGORY=app-admin diff --git a/pkg/compiler/backend/simpledocker_test.go b/pkg/compiler/backend/simpledocker_test.go index 0638af00..e3968495 100644 --- a/pkg/compiler/backend/simpledocker_test.go +++ b/pkg/compiler/backend/simpledocker_test.go @@ -87,6 +87,7 @@ ENV PACKAGE_CATEGORY=app-admin`)) Expect(err).ToNot(HaveOccurred()) Expect(dockerfile).To(Equal(` FROM luet/base +WORKDIR /luetbuild ENV PACKAGE_NAME=enman ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_CATEGORY=app-admin diff --git a/pkg/compiler/spec.go b/pkg/compiler/spec.go index 30496eed..198bc355 100644 --- a/pkg/compiler/spec.go +++ b/pkg/compiler/spec.go @@ -242,6 +242,7 @@ RUN ` + s func (cs *LuetCompilationSpec) RenderStepImage(image string) (string, error) { spec := ` FROM ` + image + ` +WORKDIR /luetbuild ENV PACKAGE_NAME=` + cs.Package.GetName() + ` ENV PACKAGE_VERSION=` + cs.Package.GetVersion() + ` ENV PACKAGE_CATEGORY=` + cs.Package.GetCategory() diff --git a/pkg/compiler/spec_test.go b/pkg/compiler/spec_test.go index a2d2ac69..821fc341 100644 --- a/pkg/compiler/spec_test.go +++ b/pkg/compiler/spec_test.go @@ -96,6 +96,7 @@ ENV test=1`)) Expect(err).ToNot(HaveOccurred()) Expect(dockerfile).To(Equal(` FROM luet/base +WORKDIR /luetbuild ENV PACKAGE_NAME=enman ENV PACKAGE_VERSION=1.4.0 ENV PACKAGE_CATEGORY=app-admin @@ -168,6 +169,7 @@ ENV test=1`)) Expect(dockerfile).To(Equal(` FROM luet/base +WORKDIR /luetbuild ENV PACKAGE_NAME=a ENV PACKAGE_VERSION=1.0 ENV PACKAGE_CATEGORY=test