Skip to content

Build Agent in Docker #351

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

Merged
merged 1 commit into from
Nov 29, 2019
Merged

Build Agent in Docker #351

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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ PROTO_BUILDER_NAME?=proto-builder
# Set this to pass additional commandline flags to the go compiler, e.g. "make test EXTRAGOARGS=-v"
export EXTRAGOARGS?=

all: $(SUBDIRS) $(GOMOD) $(GOSUM)
all: $(SUBDIRS) $(GOMOD) $(GOSUM) cni-bins test-cni-bins

$(SUBDIRS):
$(MAKE) -C $@ EXTRAGOARGS=$(EXTRAGOARGS)

all-in-docker:
%-in-docker:
docker run --rm -it \
--user $(UID):$(GID) \
--volume $(CURDIR):/src \
Expand All @@ -64,7 +64,7 @@ all-in-docker:
--env STATIC_AGENT=on \
--workdir /src \
$(FIRECRACKER_CONTAINERD_BUILDER_IMAGE) \
$(MAKE) all cni-bins test-cni-bins
$(MAKE) $(subst -in-docker,,$@)

proto:
DOCKER_BUILDKIT=1 docker build \
Expand Down Expand Up @@ -107,7 +107,7 @@ deps:
install:
for d in $(SUBDIRS); do $(MAKE) -C $$d install; done

image: $(RUNC_BIN) agent
image: $(RUNC_BIN) agent-in-docker
mkdir -p tools/image-builder/files_ephemeral/usr/local/bin
mkdir -p tools/image-builder/files_ephemeral/var/firecracker-containerd-test/scripts
for f in tools/docker/scripts/*; do test -f $$f && install -m 755 $$f tools/image-builder/files_ephemeral/var/firecracker-containerd-test/scripts; done
Expand Down