dispatcher, builder: filter args against allowedArgs while processing FROM, ADD and RUN
#232
Conversation
|
@nalind PTAL |
builder.go
Outdated
| if argNode.Value == command.Arg { | ||
| // extract declared variable | ||
| s := strings.SplitN(argNode.Original, " ", 2) | ||
| if len(s) == 2 && (strings.ToLower(s[0]) == strings.ToLower("ARG")) { |
There was a problem hiding this comment.
strings.ToLower("ARG") versus "arg"?
There was a problem hiding this comment.
Yes, switched this to an already defined constant here https://github.com/openshift/imagebuilder/blob/master/dockerfile/command/command.go#L7
Resolution of `FROM ${SOMEARG}` should happen only if `SOMEARG` was
declared in the Containerfile.
Signed-off-by: Aditya R <arajan@redhat.com>
Filter args against allowed args while processing flags for instruction `ADD` and `RUN`. Signed-off-by: Aditya R <arajan@redhat.com>
flouthoc
force-pushed
the
allowed-user-args
branch
from
cc642fa
to
054a051
Compare
|
LGTM |
1 similar comment
|
LGTM |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: flouthoc, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@flouthoc: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Following PR adds two commits to make sure we expand variables while processing
FROM,ADDandRUNonly if they are declared. See individual commits for detail.FROM: only resolve arg in
FROMif declared anywhereResolution of
FROM ${SOMEARG}should happen only ifSOMEARGwasdeclared in the Containerfile.
dispatcher: filter args against allowed args while processing flags for
ADDandRUNCloses: #231