Skip to content

OCPBUGS-62210: BuildConfig inline Dockerfile fails with heredoc syntax #469

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-62210: BuildConfig inline Dockerfile fails with heredoc syntax #469

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
5 changes: 5 additions & 0 deletions pkg/build/builder/util/dockerfile/dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ func Write(node *parser.Node) []byte {
}
buf.Write([]byte(n.Value))
}
for _, heredoc := range node.Heredocs {
buf.Write([]byte(heredoc.Content))
buf.Write([]byte("\n"))
buf.Write([]byte(heredoc.Name))
}
buf.Write([]byte("\n"))
return buf.Bytes()
}
Expand Down
30 changes: 30 additions & 0 deletions pkg/build/builder/util/dockerfile/dockerfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,36 @@ CMD ["-c","env"]
USER 1001
WORKDIR /home
HEALTHCHECK --interval=60s --timeout=10s CMD ["/usr/bin/true"]
`,
},
"Dockerfile with heredoc": {
in: `# This is a Dockerfile
FROM scratch
LABEL version=1.0
# Here we start building a second image
FROM busybox
ENV PATH=/bin
RUN <<EOF <<ALSO
pwd
EOF
ls -1
ALSO
RUN <<EOF
["ls","-1"]
EOF
`,
want: `FROM scratch
LABEL version=1.0
FROM busybox
ENV PATH=/bin
RUN <<EOF <<ALSO
pwd
EOF
ls -1
ALSO
RUN <<EOF
["ls","-1"]
EOF
`,
},
}
Expand Down