-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Spt renames #23
Spt renames #23
Conversation
ricarkol
commented
Feb 21, 2019
- remove solo5 as a submodule
- point to latest rumprun, rumprun-packages, and gorump
- change a bunch of Makefiles and Dockerfiles to use spt instead of seccomp
Signed-off-by: Ricardo Koller <[email protected]>
Signed-off-by: Ricardo Koller <[email protected]>
Signed-off-by: Ricardo Koller <[email protected]>
Signed-off-by: Ricardo Koller <[email protected]>
Signed-off-by: Ricardo Koller <[email protected]>
Signed-off-by: Ricardo Koller <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor nits, if not, LGTM!
# rumprun can only be built with gcc-6 | ||
# XXX: Not only that, this version has to match whatever | ||
# gcc was used to build rumprun in the host. | ||
RUN apt-get update && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's combine this with the previous two commands into 1 RUN
command so it will just be 1 layer. It'll help us remove the redundant apt-get update too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
go-base/Dockerfile
Outdated
# needs to be at exactly the same place where it was built. | ||
# (unless I'm missing something). | ||
ARG host_rumproot | ||
ADD rumprun-solo5 ${host_rumproot} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dockerfile best practices: Use COPY
instead of ADD
. This is because ADD
is overloaded.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
go-base/Dockerfile
Outdated
ADD gorump /gorump | ||
|
||
COPY gomaincaller.go /goapp | ||
COPY _gorump_main.c /goapp | ||
COPY Makefile.goapp /goapp | ||
|
||
ENV PATH="/root/unikernels/nabla-base-build/rumprun/rumprun-solo5/bin:${PATH}" | ||
ENV PATH=${host_rumproot}"/rumprun-solo5/bin:${PATH}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's make the quotes consistent? i.e. ENV PATH="${host_rumproot}/...
source $(RUMPRUN)/obj/config-PATH.sh && cd $(GORUMP)/go/src && CGO_ENABLED=0 GOROOT_BOOTSTRAP=$(GOBOOTSTRAP) GOOS=rumprun GOARCH=amd64 ./make.bash && cd $(GOBASE) | ||
gorump: gobootstrap rumprun FORCE | ||
source $(RUMPRUN)/obj/config && source $(RUMPRUN)/obj/config-PATH.sh && \ | ||
cd $(GORUMP)/go/src && CGO_ENABLED=0 GOROOT_BOOTSTRAP=$(GOBOOTSTRAP) GOOS=rumprun GOARCH=amd64 ./make.bash && cd $(GOBASE) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not really a problem for this PR, but in future for aarch64, we should make GOARCH
a variable. We can open an issue for this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh, didn't notice that. Was grepping for x86, will look for amd64 as well. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Creating an issue to discuss the proper way of having multiple archs
[[ "$output" == *"v4.3.0"* ]] | ||
[ "$status" -eq 0 ] | ||
} | ||
|
||
|
||
@test "test raw node (hello)" { | ||
nabla_run --disk="${BATS_TMPDIR}"/dummy ${TOPLEVEL}/node-base/node.nabla | ||
nabla_run --x-exec-heap ${TOPLEVEL}/node-base/node.nabla |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qn: what's the --x-exec-heap
flag do? and why is it only used in the node case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It makes the heap executable, it's needed because of Nodejs's JIT compiler. More here: Solo5/solo5#321
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have to add it to runnc
after pointing to latest there as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yikes... I'm curious about some details here.. Wondering if there are any other situations like this. Let's chat about this at some point!
cf71511
to
4fa9b96
Compare
- add a Makefile rumprun_stamp target so rumprun is not built for every base - travis only builds node, nginx, and go - disabled some redis and python tests, as it was taking too much time to build them and travis times out. - add test_curl which is used by runnc tests
4fa9b96
to
bc6fccf
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thanks for the changes.