Skip to content

Derive Dockerfile instruction names from pkg/docker/instruction instead of duplicating them #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Londopy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Derive Dockerfile instruction names from pkg/docker/instruction instead of duplicating them #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 7 additions & 31 deletions pkg/docker/dockerfile/dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,16 @@ import (
docker "github.com/fsouza/go-dockerclient"

"github.com/mintoolkit/mint/pkg/consts"
"github.com/mintoolkit/mint/pkg/docker/instruction"
v "github.com/mintoolkit/mint/pkg/version"
)

// note: dup (todo: refactor)
const (
//MAINTAINER:
instPrefixMaintainer = "MAINTAINER "
//ENTRYPOINT:
instTypeEntrypoint = "ENTRYPOINT"
instPrefixEntrypoint = "ENTRYPOINT "
//CMD:
instTypeCmd = "CMD"
instPrefixCmd = "CMD "
//USER:
instTypeUser = "USER"
instPrefixUser = "USER "
//EXPOSE:
instTypeExpose = "EXPOSE"
instPrefixExpose = "EXPOSE "
//WORKDIR:
instTypeWorkdir = "WORKDIR"
instPrefixWorkdir = "WORKDIR "
//HEALTHCHECK:
instTypeHealthcheck = "HEALTHCHECK"
instPrefixHealthcheck = "HEALTHCHECK "
//ONBUILD:
instTypeOnbuild = "ONBUILD"
//RUN:
instTypeRun = "RUN"
instPrefixRun = "RUN "
//ADD:
instTypeAdd = "ADD"
//COPY:
instTypeCopy = "COPY"
// Instruction prefixes in the uppercase form written to the Dockerfile,
// derived from the canonical names in pkg/docker/instruction
var (
instPrefixUser = strings.ToUpper(instruction.User) + " "
instPrefixExpose = strings.ToUpper(instruction.Expose) + " "
instPrefixWorkdir = strings.ToUpper(instruction.Workdir) + " "
)

// GenerateFromInfo builds and saves a Dockerfile file object
Expand Down
79 changes: 40 additions & 39 deletions pkg/docker/dockerfile/reverse/reverse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
log "github.com/sirupsen/logrus"

"github.com/mintoolkit/mint/pkg/crt"
"github.com/mintoolkit/mint/pkg/docker/instruction"
)

var (
Expand Down Expand Up @@ -105,45 +106,45 @@ const (
runInstArgsPrefix = "|"
)

const (
//MAINTAINER:
instTypeMaintainer = "MAINTAINER"
instPrefixMaintainer = "MAINTAINER "
//ENTRYPOINT:
instTypeEntrypoint = "ENTRYPOINT"
instPrefixEntrypoint = "ENTRYPOINT "
//CMD:
instTypeCmd = "CMD"
instPrefixCmd = "CMD "
//USER:
instTypeUser = "USER"
instPrefixUser = "USER "
//EXPOSE:
instTypeExpose = "EXPOSE"
instPrefixExpose = "EXPOSE "
//WORKDIR:
instTypeWorkdir = "WORKDIR"
instPrefixWorkdir = "WORKDIR "
//HEALTHCHECK:
instTypeHealthcheck = "HEALTHCHECK"
instPrefixHealthcheck = "HEALTHCHECK "
instPrefixBasicEncHealthcheck = "HEALTHCHECK --"
//ONBUILD:
instTypeOnbuild = "ONBUILD"
//RUN:
instTypeRun = "RUN"
instPrefixRun = "RUN "
//ADD:
instTypeAdd = "ADD"
//COPY:
instTypeCopy = "COPY"

instTypeVolume = "VOLUME"
instTypeEnv = "ENV"
instTypeLabel = "LABEL"
instTypeStopSignal = "STOPSIGNAL"
instTypeShell = "SHELL"
instTypeArg = "ARG" //shouldn't see it as an standalone instruction
// Instruction names in the uppercase form used in image history data,
// derived from the canonical names in pkg/docker/instruction
var (
instTypeMaintainer = strings.ToUpper(instruction.Maintainer)
instPrefixMaintainer = instTypeMaintainer + " "

instTypeEntrypoint = strings.ToUpper(instruction.Entrypoint)
instPrefixEntrypoint = instTypeEntrypoint + " "

instTypeCmd = strings.ToUpper(instruction.Cmd)
instPrefixCmd = instTypeCmd + " "

instTypeUser = strings.ToUpper(instruction.User)
instPrefixUser = instTypeUser + " "

instTypeExpose = strings.ToUpper(instruction.Expose)
instPrefixExpose = instTypeExpose + " "

instTypeWorkdir = strings.ToUpper(instruction.Workdir)
instPrefixWorkdir = instTypeWorkdir + " "

instTypeHealthcheck = strings.ToUpper(instruction.Healthcheck)
instPrefixHealthcheck = instTypeHealthcheck + " "
instPrefixBasicEncHealthcheck = instTypeHealthcheck + " --"

instTypeOnbuild = strings.ToUpper(instruction.Onbuild)

instTypeRun = strings.ToUpper(instruction.Run)
instPrefixRun = instTypeRun + " "

instTypeAdd = strings.ToUpper(instruction.Add)
instTypeCopy = strings.ToUpper(instruction.Copy)

instTypeVolume = strings.ToUpper(instruction.Volume)
instTypeEnv = strings.ToUpper(instruction.Env)
instTypeLabel = strings.ToUpper(instruction.Label)
instTypeStopSignal = strings.ToUpper(instruction.StopSignal)
instTypeShell = strings.ToUpper(instruction.Shell)
instTypeArg = strings.ToUpper(instruction.Arg) //shouldn't see it as an standalone instruction
)

var instructionTypes = map[string]struct{}{
Expand Down