mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

dockerfile: extract a common part in one file

Browse Source 
Signed-off-by: Andrew Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Andrew Vagin
2016-02-18 20:41:08 +03:00
committed by Pavel Emelyanov
parent 1621ba56ac
commit afae962c66
10 changed files with 44 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@@ -1,18 +0,0 @@
FROM ubuntu:utopic
RUN apt-get update && apt-get install -y \
build-essential \
protobuf-c-compiler \
libprotobuf-c0-dev \
libprotobuf-dev \
bsdmainutils \
protobuf-compiler \
python-minimal \
libaio-dev \
iptables
COPY . /criu
WORKDIR /criu
RUN make clean && make -j $(nproc)
RUN make -j $(nproc) -C test ZDTM_ARGS="-C -x static/rtc -x mountpoint -x static/cgroup02 -x tcp6 -x tcpbuf6"

5
Makefile
View File

@@ -192,11 +192,12 @@ gcov:
PHONY += gcov
docker-build:
docker build -t criu .
$(MAKE) -C scripts/build/ x86_64
PHONY += docker-build
docker-test:
docker run --rm -it --privileged criu ./test/zdtm.sh -C -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup -x mountpoint
docker run --rm -it --privileged criu-x86_64 ./test/zdtm.sh -C -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup -x mountpoint
PHONY += docker-test
help:

22
scripts/build/Dockerfile.aarch64
View File

@@ -1,22 +0,0 @@
FROM aarch64/ubuntu:trusty
COPY scripts/build/qemu-user-static/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
RUN apt-get update
RUN apt-get update && apt-get install -y \
build-essential \
protobuf-c-compiler \
libprotobuf-c0-dev \
libprotobuf-dev \
bsdmainutils \
protobuf-compiler \
python-minimal \
libaio-dev \
iptables \
libnl-3-dev
COPY . /criu
WORKDIR /criu
RUN make clean && make -j $(nproc)

3
scripts/build/Dockerfile.aarch64.hdr Normal file
View File

@@ -0,0 +1,3 @@
FROM aarch64/ubuntu:trusty
COPY scripts/build/qemu-user-static/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static

22
scripts/build/Dockerfile.armv7hf
View File

@@ -1,22 +0,0 @@
FROM armv7/armhf-ubuntu
COPY scripts/build/qemu-user-static/usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
RUN apt-get update
RUN apt-get update && apt-get install -y \
build-essential \
protobuf-c-compiler \
libprotobuf-c0-dev \
libprotobuf-dev \
bsdmainutils \
protobuf-compiler \
python-minimal \
libaio-dev \
iptables \
libnl-3-dev
COPY . /criu
WORKDIR /criu
RUN make clean && make -j $(nproc)

3
scripts/build/Dockerfile.armv7hf.hdr Normal file
View File

@@ -0,0 +1,3 @@
FROM armv7/armhf-ubuntu
COPY scripts/build/qemu-user-static/usr/bin/qemu-arm-static /usr/bin/qemu-arm-static

22
scripts/build/Dockerfile.ppc64le
View File

@@ -1,22 +0,0 @@
FROM ppc64le/ubuntu
COPY scripts/build/qemu-user-static/usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le-static
RUN apt-get update
RUN apt-get update && apt-get install -y \
build-essential \
protobuf-c-compiler \
libprotobuf-c0-dev \
libprotobuf-dev \
bsdmainutils \
protobuf-compiler \
python-minimal \
libaio-dev \
iptables \
libnl-3-dev
COPY . /criu
WORKDIR /criu
RUN make clean && make -j $(nproc)

3
scripts/build/Dockerfile.ppc64le.hdr Normal file
View File

@@ -0,0 +1,3 @@
FROM ppc64le/ubuntu
COPY scripts/build/qemu-user-static/usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le-static

1
scripts/build/Dockerfile.x86_64.hdr Normal file
View File

@@ -0,0 +1 @@
FROM ubuntu:wily

39
scripts/build/Makefile
View File

@@ -1,24 +1,47 @@
all: armv7hf aarch64 ppc64le
AARCH64_IMG ?= aarch64/ubuntu:trusty
ARMV7HF_IMG ?= armv7/armhf-ubuntu
PPC64LE_IMG ?= ppc64le/ubuntu
.FORCE:
Dockerfile.aarch64: Dockerfile.aarch64.hdr Dockerfile.tmpl
cat Dockerfile.aarch64.hdr > Dockerfile.aarch64
cat Dockerfile.tmpl >> Dockerfile.aarch64
Dockerfile.armv7hf: Dockerfile.armv7hf.hdr Dockerfile.tmpl
cat Dockerfile.armv7hf.hdr > Dockerfile.armv7hf
cat Dockerfile.tmpl >> Dockerfile.armv7hf
Dockerfile.ppc64le: Dockerfile.ppc64le.hdr Dockerfile.tmpl
cat Dockerfile.ppc64le.hdr > Dockerfile.ppc64le
cat Dockerfile.tmpl >> Dockerfile.ppc64le
Dockerfile.x86_64: Dockerfile.x86_64.hdr Dockerfile.tmpl
cat Dockerfile.x86_64.hdr > Dockerfile.x86_64
cat Dockerfile.tmpl >> Dockerfile.x86_64
qemu-user-static:
./extract-deb-pkg qemu-user-static
binfmt_misc: .FORCE
./binfmt_misc
armv7hf: qemu-user-static binfmt_misc
armv7hf: qemu-user-static binfmt_misc Dockerfile.armv7hf
docker build -t criu-armv7hf -f Dockerfile.armv7hf ../..
aarch64: qemu-user-static binfmt_misc
aarch64: qemu-user-static binfmt_misc Dockerfile.aarch64
docker build -t criu-aarch64 -f Dockerfile.aarch64 ../..
ppc64le: qemu-user-static binfmt_misc
docker build -t criu-aarch64 -f Dockerfile.ppc64le ../..
ppc64le: qemu-user-static binfmt_misc Dockerfile.ppc64le
docker build -t criu-ppc64le -f Dockerfile.ppc64le ../..
x86_64: Dockerfile.x86_64
docker build -t criu-x86_64 -f Dockerfile.x86_64 ../..
clean:
echo -1 > /proc/sys/fs/binfmt_misc/ppc64le
echo -1 > /proc/sys/fs/binfmt_misc/armv7hf
echo -1 > /proc/sys/fs/binfmt_misc/aarch64
rm -rf qemu-user-static
[ ! -f /proc/sys/fs/binfmt_misc/ppc64le ] || echo -1 > /proc/sys/fs/binfmt_misc/ppc64le
[ ! -f /proc/sys/fs/binfmt_misc/armv7hf ] || echo -1 > /proc/sys/fs/binfmt_misc/armv7hf
[ ! -f /proc/sys/fs/binfmt_misc/aarch64 ] || echo -1 > /proc/sys/fs/binfmt_misc/aarch64
rm -rf qemu-user-static Dockerfile.aarch64 Dockerfile.armv7hf Dockerfile.ppc64le Dockerfile.x86_64