jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
runc/Makefile

155 lines
4.7 KiB
Makefile
Raw Normal View History

Makefile: allow overriding `docker` command e.g. `make CONTAINER_ENGINE="sudo podman" unittest` (for ease of cgroup2 testing) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-10-28 12:08:39 +08:00
CONTAINER_ENGINE := docker
makefile: drop usage of --install The "go build -i" invocation may slightly help with incremental recompilation, but it will cause builds to fail if $GOROOT is not writeable by the current user. While this does appear to work sometimes, it's a concern for external build systems where "-i" causes build errors for no real gain. Given the size of the runc project, --install is not really giving us much anyway. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-13 22:10:28 +08:00
GO := go
Add bash completion support I have taken the docker command completions code and reworked it for runc support. Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-05-11 21:48:59 +08:00
PREFIX := $(DESTDIR)/usr/local
Revert back to using /sbin This was changed in https://github.com/opencontainers/runc/commit/d2f49696#diff-b67911656ef5d18c4ae36cb6741b7965R7 and is causing install problems for people building runc and having it installed in /bin and /sbin. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-15 01:15:33 +08:00
BINDIR := $(PREFIX)/sbin
Makefile: fix/clean install-man Target `install-man` was not dependent on `man`, meaning no man pages were installed unless one called `make man` beforehand. Fix this. Remove many man-related variables, only leaving MANDIR, which is an installation directory for man pages. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:49:39 +08:00
MANDIR := $(PREFIX)/share/man
Use git branch name as tag when building images Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-29 06:39:38 +08:00
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
RUNC_IMAGE := runc_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
Add target man in Makefile Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-22 14:37:42 +08:00
PROJECT := github.com/opencontainers/runc
Makefile: add selinux and apparmor build tags Both selinux and apparmor subsystem can detect whether it is enabled, and act accordingly. Compiling it in by default should help avoid some frustration cased by missing build tags. This should not change anything in case BUILDTAGS is already set. README.md is amended to clarify what BUILDTAGS are enabled by default. [v2: add apparmor] [v3: add it unconditionally, fix README] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-03-12 02:39:13 +08:00
BUILDTAGS ?= seccomp selinux apparmor
Append string "-dirty" to version if git repo is unclean If runc binary is compiled from codes with modified but not commited files, git commits should report "COMMIT-dirty" instead of single "COMMIT" to warn users. Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-09-04 16:00:26 +08:00
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
Makefile: use $(FOO) not ${FOO} The first style seems to be prevalent. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:48:12 +08:00
COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"$(COMMIT_NO)-dirty","$(COMMIT_NO)")
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
VERSION := $(shell cat ./VERSION)
Makefile: don't use -mod=vendor if GO111MODULE=off This fixes the following bug: > $ GO111MODULE=off make > go build "-mod=vendor" -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="19ba7688cb4e0922d53029e2f7c1f2af45d40938-dirty" -X main.version=1.0.0-rc10+dev " -o runc . > build flag -mod=vendor only valid when using modules Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:15:44 +08:00
# TODO: rm -mod=vendor once go 1.13 is unsupported
ifneq ($(GO111MODULE),off)
MOD_VENDOR := "-mod=vendor"
endif
Remove "-buildmode=pie" from platforms that don't support it This sequence (and syntax) is inspired by containerd's implementation of the same: https://github.com/containerd/containerd/blob/4e08c2de67ec514b5602eea47804d41dfeabdc72/Makefile.linux#L21-L26 Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-05-20 00:44:06 +08:00
ifeq ($(shell $(GO) env GOOS),linux)
ifeq (,$(filter $(shell $(GO) env GOARCH),mips mipsle mips64 mips64le ppc64))
GO_BUILDMODE := "-buildmode=pie"
endif
endif
GO_BUILD := $(GO) build $(MOD_VENDOR) $(GO_BUILDMODE) $(EXTRA_FLAGS) -tags "$(BUILDTAGS)" \
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
-ldflags "-X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
Makefile: don't use -mod=vendor if GO111MODULE=off This fixes the following bug: > $ GO111MODULE=off make > go build "-mod=vendor" -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="19ba7688cb4e0922d53029e2f7c1f2af45d40938-dirty" -X main.version=1.0.0-rc10+dev " -o runc . > build flag -mod=vendor only valid when using modules Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:15:44 +08:00
GO_BUILD_STATIC := CGO_ENABLED=1 $(GO) build $(MOD_VENDOR) $(EXTRA_FLAGS) -tags "$(BUILDTAGS) netgo osusergo" \
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
-ldflags "-w -extldflags -static -X main.gitCommit=$(COMMIT) -X main.version=$(VERSION) $(EXTRA_LDFLAGS)"
Add target man in Makefile Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-22 14:37:42 +08:00
contrib: add recvtty proof-of-concept This is a proof-of-concept for the --console-socket API. It just acts as a dumb input-output copy process (nowhere near as good as the internal runC one since it doesn't handle console resizes or signals). It also provides a test-friendly mode that will be used in the bats integration tests. This patch is part of the console rewrite patchset. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-05 20:29:03 +08:00
.DEFAULT: runc
Makefile: rm $(SOURCES), mark targets as PHONY Since go has its own way to track dependencies and rebuild if needed, and it is efficient enough, let's drop using SOURCES variable, mark all targets as PHONY and let golang do its job. The primary motivation for this was concern about using find on every make invocation to build the list of all sources. Some unscientific performance analisys: Before: > $ time make > make: 'runc' is up to date. > > real 0m0.202s > user 0m0.177s > sys 0m0.031s After: > $ time make > go build -mod=vendor -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="5a8210a58bd0f07cc987e6201b4174e5b93fa115" -X main.version=1.0.0-rc10+dev " -o runc . > > real 0m0.149s > user 0m0.315s > sys 0m0.106s So, it is slightly faster using the wall clock, uses more CPU, but we can be sure the binary is always up to date. This also fixes the Makefile to mark all targets as PHONY. The list was generated by `grep -E '^[a-z-]+:' Makefile | sed 's/:.*//'`. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:44:25 +08:00
runc:
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
$(GO_BUILD) -o runc .
Add makefile targets for basic lint and testing Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-27 04:06:17 +08:00
contrib: add recvtty proof-of-concept This is a proof-of-concept for the --console-socket API. It just acts as a dumb input-output copy process (nowhere near as good as the internal runC one since it doesn't handle console resizes or signals). It also provides a test-friendly mode that will be used in the bats integration tests. This patch is part of the console rewrite patchset. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-05 20:29:03 +08:00
all: runc recvtty
Makefile: rm $(SOURCES), mark targets as PHONY Since go has its own way to track dependencies and rebuild if needed, and it is efficient enough, let's drop using SOURCES variable, mark all targets as PHONY and let golang do its job. The primary motivation for this was concern about using find on every make invocation to build the list of all sources. Some unscientific performance analisys: Before: > $ time make > make: 'runc' is up to date. > > real 0m0.202s > user 0m0.177s > sys 0m0.031s After: > $ time make > go build -mod=vendor -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="5a8210a58bd0f07cc987e6201b4174e5b93fa115" -X main.version=1.0.0-rc10+dev " -o runc . > > real 0m0.149s > user 0m0.315s > sys 0m0.106s So, it is slightly faster using the wall clock, uses more CPU, but we can be sure the binary is always up to date. This also fixes the Makefile to mark all targets as PHONY. The list was generated by `grep -E '^[a-z-]+:' Makefile | sed 's/:.*//'`. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:44:25 +08:00
recvtty:
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
$(GO_BUILD) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
contrib: add recvtty proof-of-concept This is a proof-of-concept for the --console-socket API. It just acts as a dumb input-output copy process (nowhere near as good as the internal runC one since it doesn't handle console resizes or signals). It also provides a test-friendly mode that will be used in the bats integration tests. This patch is part of the console rewrite patchset. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-05 20:29:03 +08:00
Makefile: rm $(SOURCES), mark targets as PHONY Since go has its own way to track dependencies and rebuild if needed, and it is efficient enough, let's drop using SOURCES variable, mark all targets as PHONY and let golang do its job. The primary motivation for this was concern about using find on every make invocation to build the list of all sources. Some unscientific performance analisys: Before: > $ time make > make: 'runc' is up to date. > > real 0m0.202s > user 0m0.177s > sys 0m0.031s After: > $ time make > go build -mod=vendor -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="5a8210a58bd0f07cc987e6201b4174e5b93fa115" -X main.version=1.0.0-rc10+dev " -o runc . > > real 0m0.149s > user 0m0.315s > sys 0m0.106s So, it is slightly faster using the wall clock, uses more CPU, but we can be sure the binary is always up to date. This also fixes the Makefile to mark all targets as PHONY. The list was generated by `grep -E '^[a-z-]+:' Makefile | sed 's/:.*//'`. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:44:25 +08:00
static:
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
$(GO_BUILD_STATIC) -o runc .
$(GO_BUILD_STATIC) -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
static binary \o/ Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-15 08:33:52 +08:00
move from Godeps to vndr This uses the standard go vendor location instead of old Godeps location. Also remove usage of symlink GOPATH. Since our README mentions that you should build it inside GOPATH, i think its a reasonable to assume that you dont need to create a tmp GOPATH. Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2017-02-23 07:02:13 +08:00
release:
release: import umoci's release.sh script This script is far easier to use than the previous `make release` target, not to mention that it also automatically signs all of the artefacts and makes everything really easy to do for maintainers. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-11 22:07:49 +08:00
script/release.sh -r release/$(VERSION) -v $(VERSION)
Introduce make release So we can make all types of release binary with combination of following flags: seccomp selinux apparmor static All binary files are put in release/ dir, like: [root@zlosvm1 runc]# ls -l release total 53556 -rwxr-xr-x 1 root root 9517965 Aug 24 16:59 runc -rwxr-xr-x 1 root root 9673533 Aug 24 17:00 runc.seccomp -rwxr-xr-x 1 root root 9705839 Aug 24 17:00 runc.seccomp.selinux -rwxr-xr-x 1 root root 9546175 Aug 24 16:59 runc.selinux -rwxr-xr-x 1 root root 8205015 Aug 24 16:59 runc.selinux.static -rwxr-xr-x 1 root root 8181789 Aug 24 16:59 runc.static ... Closes #899 Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
2016-06-14 18:03:35 +08:00
Combine runctestimage and runcimage There is no need that keep them separate, it also fixes #1006. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-30 09:46:47 +08:00
dbuild: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
--privileged --rm \
-v $(CURDIR):/go/src/$(PROJECT) \
$(RUNC_IMAGE) make clean all
*: enable full test suite on make test Enable the full test suite to run on `make test`. They also all run inside a Docker container for maximum reproducibility. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-26 16:00:01 +08:00
Fix the build by removing go get for vet golang.org/x/tools/cmd/vet has been removed as it is available in go cmd directly Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-08 00:36:08 +08:00
lint:
Makefile: rm $(allpackages) This was added by commit 993cbf9db but since some time ago (go 1.13 for sure, but may be earlier) is no longer needed since all the tools are correctly skipping vendor subdir. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:20:20 +08:00
$(GO) vet ./...
$(GO) fmt ./...
Add makefile targets for basic lint and testing Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-27 04:06:17 +08:00
Add target man in Makefile Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-22 14:37:42 +08:00
man:
man/md2man-all.sh
Combine runctestimage and runcimage There is no need that keep them separate, it also fixes #1006. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-30 09:46:47 +08:00
runcimage:
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) build $(CONTAINER_ENGINE_BUILD_FLAGS) -t $(RUNC_IMAGE) .
Add makefile targets for basic lint and testing Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-27 04:06:17 +08:00
Makefile: test, localtest: no need to invoke make Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:55:24 +08:00
test: unittest integration rootlessintegration
Add makefile targets for basic lint and testing Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-27 04:06:17 +08:00
Makefile: test, localtest: no need to invoke make Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:55:24 +08:00
localtest: localunittest localintegration localrootlessintegration
Add seccomp build tag Add a seccomp build tag and also support in the Makefile to add or remove build tags. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-08-22 06:25:26 +08:00
Combine runctestimage and runcimage There is no need that keep them separate, it also fixes #1006. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-30 09:46:47 +08:00
unittest: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
-t --privileged --rm \
-v /lib/modules:/lib/modules:ro \
-v $(CURDIR):/go/src/$(PROJECT) \
$(RUNC_IMAGE) make localunittest TESTFLAGS=$(TESTFLAGS)
*: enable full test suite on make test Enable the full test suite to run on `make test`. They also all run inside a Docker container for maximum reproducibility. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-26 16:00:01 +08:00
localunittest: all
Makefile: rm uninstall* targets These targets are not very reliable and, depending on environment variables, migth result in data loss. For example: make DESTDIR=`pwd`/tmp install ... make uninstall The first make command will install $CURDIR/tmp/usr/local/bin/runc, while the last command will remove /usr/local/bin/runc. One way to support uninstall would be to write a temp file during installation, which would contain the files we have installed. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:37:36 +08:00
$(GO) test $(MOD_VENDOR) -timeout 3m -tags "$(BUILDTAGS)" $(TESTFLAGS) -v ./...
Initial commit of runc binary Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-22 10:31:12 +08:00
Makefile: Fix wrong dependency of "integration" target Change dependency of integration to runcimage. Signed-off-by: Jiuyue Ma <majiuyue@huawei.com>
2016-09-05 18:06:03 +08:00
integration: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
-t --privileged --rm \
-v /lib/modules:/lib/modules:ro \
-v $(CURDIR):/go/src/$(PROJECT) \
$(RUNC_IMAGE) make localintegration TESTPATH=$(TESTPATH)
adds integration tests Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-03-15 03:55:05 +08:00
*: enable full test suite on make test Enable the full test suite to run on `make test`. They also all run inside a Docker container for maximum reproducibility. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-26 16:00:01 +08:00
localintegration: all
Makefile: use $(FOO) not ${FOO} The first style seems to be prevalent. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:48:12 +08:00
bats -t tests/integration$(TESTPATH)
*: enable full test suite on make test Enable the full test suite to run on `make test`. They also all run inside a Docker container for maximum reproducibility. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-04-26 16:00:01 +08:00
tests: add rootless integration tests This adds targets for rootless integration tests, as well as all of the required setup in order to get the tests to run. This includes quite a few changes, because of a lot of assumptions about things running as root within the bats scripts (which is not true when setting up rootless containers). Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-05-11 15:45:00 +08:00
rootlessintegration: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
-t --privileged --rm \
-v $(CURDIR):/go/src/$(PROJECT) \
-e ROOTLESS_TESTPATH \
$(RUNC_IMAGE) make localrootlessintegration
tests: add rootless integration tests This adds targets for rootless integration tests, as well as all of the required setup in order to get the tests to run. This includes quite a few changes, because of a lot of assumptions about things running as root within the bats scripts (which is not true when setting up rootless containers). Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-05-11 15:45:00 +08:00
localrootlessintegration: all
tests: generalise rootless runner This is necessary in order to add proper opportunistic tests, and is a placeholder until we add tests for new{uid,gid}map configurations. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-09-07 05:07:43 +08:00
tests/rootless.sh
tests: add rootless integration tests This adds targets for rootless integration tests, as well as all of the required setup in order to get the tests to run. This includes quite a few changes, because of a lot of assumptions about things running as root within the bats scripts (which is not true when setting up rootless containers). Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-05-11 15:45:00 +08:00
Fix make shell The "shell" rule in the Makefile uses docker to run a bash session, however it was depending on the "all" rule which assumes non-docker local development. This commit fixes it by making it depend on the "runcimage" rule. Signed-off-by: Tibor Vass <tibor@docker.com>
2018-02-28 13:23:01 +08:00
shell: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
-ti --privileged --rm \
-v $(CURDIR):/go/src/$(PROJECT) \
$(RUNC_IMAGE) bash
tests: fix all the things This fixes all of the tests that were broken as part of the console rewrite. This includes fixing the integration tests that used TTY handling inside libcontainer, as well as the bats integration tests that needed to be rewritten to use recvtty (as they rely on detached containers that are running). This patch is part of the console rewrite patchset. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-06 20:40:01 +08:00
Remove all for make install This is not how Makefiles work and install should not build everything again. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-30 04:33:15 +08:00
install:
Add bash completion support I have taken the docker command completions code and reworked it for runc support. Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-05-11 21:48:59 +08:00
install -D -m0755 runc $(BINDIR)/runc
install-bash:
install -D -m0644 contrib/completions/bash/runc $(PREFIX)/share/bash-completion/completions/runc
Initial commit of runc binary Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-22 10:31:12 +08:00
Makefile: fix/clean install-man Target `install-man` was not dependent on `man`, meaning no man pages were installed unless one called `make man` beforehand. Fix this. Remove many man-related variables, only leaving MANDIR, which is an installation directory for man pages. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:49:39 +08:00
install-man: man
install -d -m 755 $(MANDIR)/man8
install -D -m 644 man/man8/*.8 $(MANDIR)/man8
Add target man in Makefile Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-04-22 14:37:42 +08:00
Initial commit of runc binary Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-06-22 10:31:12 +08:00
clean:
travis: test cross compilation Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-16 08:29:52 +08:00
rm -f runc runc-*
contrib: add recvtty proof-of-concept This is a proof-of-concept for the --console-socket API. It just acts as a dumb input-output copy process (nowhere near as good as the internal runC one since it doesn't handle console resizes or signals). It also provides a test-friendly mode that will be used in the bats integration tests. This patch is part of the console rewrite patchset. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-05 20:29:03 +08:00
rm -f contrib/cmd/recvtty/recvtty
Makefile: rm RELEASE_DIR and SHELL RELEASE_DIR is only used once, so it doesn't make sense to have it. SHELL was introduced in commit 54390f89a76fef305c and was used implicitly (since Makefile contained some bash-specific code), but is no longer needed since commit ed68ee1e1054fee08d. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 05:10:51 +08:00
rm -rf release
Makefile: fix/clean install-man Target `install-man` was not dependent on `man`, meaning no man pages were installed unless one called `make man` beforehand. Fix this. Remove many man-related variables, only leaving MANDIR, which is an installation directory for man pages. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:49:39 +08:00
rm -rf man/man8
Add ci target Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-01 03:51:09 +08:00
Fix the build by removing go get for vet golang.org/x/tools/cmd/vet has been removed as it is available in go cmd directly Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-08 00:36:08 +08:00
validate:
Add ci target Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-01 03:51:09 +08:00
script/validate-gofmt
make: validate C format Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-23 12:25:16 +08:00
script/validate-c
Makefile: rm $(allpackages) This was added by commit 993cbf9db but since some time ago (go 1.13 for sure, but may be earlier) is no longer needed since all the tools are correctly skipping vendor subdir. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:20:20 +08:00
$(GO) vet ./...
Add ci target Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-01 03:51:09 +08:00
ci: smoke-test the release script To make sure that `make release` doesn't suddenly break after we've cut a release, smoke-test the release scripts. The script won't fail if GPG keys aren't found, so running in CI shouldn't be a huge issue. Signed-off-by: Aleksa Sarai <asarai@suse.de>
2017-08-15 01:26:38 +08:00
ci: validate test release
move from Godeps to vndr This uses the standard go vendor location instead of old Godeps location. Also remove usage of symlink GOPATH. Since our README mentions that you should build it inside GOPATH, i think its a reasonable to assume that you dont need to create a tmp GOPATH. Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2017-02-23 07:02:13 +08:00
Make CI script to verify that vendor is in sync Signed-off-by: Odin Ugedal <odin@ugedal.com>
2019-06-20 03:56:44 +08:00
vendor:
export GO111MODULE=on \
$(GO) mod tidy && \
$(GO) mod vendor && \
$(GO) mod verify
verify-dependencies: vendor
@test -z "$$(git status --porcelain -- go.mod go.sum vendor/)" \
|| (echo -e "git status:\n $$(git status -- go.mod go.sum vendor/)\nerror: vendor/, go.mod and/or go.sum not up to date. Run \"make vendor\" to update"; exit 1) \
&& echo "all vendor files are up to date."
travis: test cross compilation Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-16 08:29:52 +08:00
cross: runcimage
Makefile: split long lines It's hard to read otherwise (at least for me). While at it, replace ${FOO} with $(FOO) -- both are identical, but the second style looks to be used more. No functional change. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:42:58 +08:00
$(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
-e BUILDTAGS="$(BUILDTAGS)" --rm \
-v $(CURDIR):/go/src/$(PROJECT) \
$(RUNC_IMAGE) make localcross
travis: test cross compilation Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-16 08:29:52 +08:00
localcross:
Makefile: abstract go build flags There are way to many arguments to go build, and they are repeatedly used across the makefile. Separate them out to GO_BUILD and GO_BUILD_STATIC variables. While at it, let's be consistem about the style and use $(FOO) everywhere (there is no difference from ${FOO}). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-21 03:33:58 +08:00
CGO_ENABLED=1 GOARCH=arm GOARM=6 CC=arm-linux-gnueabi-gcc $(GO_BUILD) -o runc-armel .
CGO_ENABLED=1 GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc $(GO_BUILD) -o runc-armhf .
CGO_ENABLED=1 GOARCH=arm64 CC=aarch64-linux-gnu-gcc $(GO_BUILD) -o runc-arm64 .
CGO_ENABLED=1 GOARCH=ppc64le CC=powerpc64le-linux-gnu-gcc $(GO_BUILD) -o runc-ppc64le .
Makefile: rm $(SOURCES), mark targets as PHONY Since go has its own way to track dependencies and rebuild if needed, and it is efficient enough, let's drop using SOURCES variable, mark all targets as PHONY and let golang do its job. The primary motivation for this was concern about using find on every make invocation to build the list of all sources. Some unscientific performance analisys: Before: > $ time make > make: 'runc' is up to date. > > real 0m0.202s > user 0m0.177s > sys 0m0.031s After: > $ time make > go build -mod=vendor -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="5a8210a58bd0f07cc987e6201b4174e5b93fa115" -X main.version=1.0.0-rc10+dev " -o runc . > > real 0m0.149s > user 0m0.315s > sys 0m0.106s So, it is slightly faster using the wall clock, uses more CPU, but we can be sure the binary is always up to date. This also fixes the Makefile to mark all targets as PHONY. The list was generated by `grep -E '^[a-z-]+:' Makefile | sed 's/:.*//'`. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:44:25 +08:00
.PHONY: runc all recvtty static release dbuild lint man runcimage \
test localtest unittest localunittest integration localintegration \
rootlessintegration localrootlessintegration shell install install-bash \
Makefile: rm uninstall* targets These targets are not very reliable and, depending on environment variables, migth result in data loss. For example: make DESTDIR=`pwd`/tmp install ... make uninstall The first make command will install $CURDIR/tmp/usr/local/bin/runc, while the last command will remove /usr/local/bin/runc. One way to support uninstall would be to write a temp file during installation, which would contain the files we have installed. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 04:37:36 +08:00
install-man clean validate ci \
Makefile: rm $(SOURCES), mark targets as PHONY Since go has its own way to track dependencies and rebuild if needed, and it is efficient enough, let's drop using SOURCES variable, mark all targets as PHONY and let golang do its job. The primary motivation for this was concern about using find on every make invocation to build the list of all sources. Some unscientific performance analisys: Before: > $ time make > make: 'runc' is up to date. > > real 0m0.202s > user 0m0.177s > sys 0m0.031s After: > $ time make > go build -mod=vendor -buildmode=pie -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="5a8210a58bd0f07cc987e6201b4174e5b93fa115" -X main.version=1.0.0-rc10+dev " -o runc . > > real 0m0.149s > user 0m0.315s > sys 0m0.106s So, it is slightly faster using the wall clock, uses more CPU, but we can be sure the binary is always up to date. This also fixes the Makefile to mark all targets as PHONY. The list was generated by `grep -E '^[a-z-]+:' Makefile | sed 's/:.*//'`. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2020-04-28 03:44:25 +08:00
vendor verify-dependencies cross localcross