Build with ostree
Build using a locally-built copy of ostree in testing setups. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
parent
d76645680f
commit
1e1d6a512f
4 changed files with 28 additions and 0 deletions
|
|
@ -13,12 +13,20 @@ services:
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get -qq update
|
- sudo apt-get -qq update
|
||||||
- sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
|
- sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
|
||||||
|
- sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- make install.tools
|
- make install.tools
|
||||||
|
- git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree
|
||||||
|
- pushd ${TRAVIS_BUILD_DIR}/ostree
|
||||||
|
- ./autogen.sh --prefix=/usr/local
|
||||||
|
- make all
|
||||||
|
- sudo make install
|
||||||
|
- popd
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- export PATH=$HOME/gopath/bin:$PATH
|
- export PATH=$HOME/gopath/bin:$PATH
|
||||||
|
- export LD_LIBRARY_PATH=/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- make .gitvalidation
|
- make .gitvalidation
|
||||||
|
|
|
||||||
10
Dockerfile
10
Dockerfile
|
|
@ -5,17 +5,24 @@ RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/a
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
apparmor \
|
apparmor \
|
||||||
|
autoconf \
|
||||||
|
automake \
|
||||||
|
bison \
|
||||||
build-essential \
|
build-essential \
|
||||||
curl \
|
curl \
|
||||||
|
e2fslibs-dev \
|
||||||
gawk \
|
gawk \
|
||||||
iptables \
|
iptables \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libaio-dev \
|
libaio-dev \
|
||||||
libcap-dev \
|
libcap-dev \
|
||||||
|
libfuse-dev \
|
||||||
|
libostree-dev \
|
||||||
libprotobuf-dev \
|
libprotobuf-dev \
|
||||||
libprotobuf-c0-dev \
|
libprotobuf-c0-dev \
|
||||||
libseccomp2/jessie-backports \
|
libseccomp2/jessie-backports \
|
||||||
libseccomp-dev/jessie-backports \
|
libseccomp-dev/jessie-backports \
|
||||||
|
libtool \
|
||||||
protobuf-c-compiler \
|
protobuf-c-compiler \
|
||||||
protobuf-compiler \
|
protobuf-compiler \
|
||||||
python-minimal \
|
python-minimal \
|
||||||
|
|
@ -25,6 +32,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
libdevmapper1.02.1 \
|
libdevmapper1.02.1 \
|
||||||
libdevmapper-dev \
|
libdevmapper-dev \
|
||||||
libgpgme11-dev \
|
libgpgme11-dev \
|
||||||
|
liblzma-dev \
|
||||||
netcat \
|
netcat \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& apt-get clean
|
&& apt-get clean
|
||||||
|
|
@ -78,6 +86,8 @@ WORKDIR /go/src/github.com/kubernetes-incubator/cri-o
|
||||||
|
|
||||||
ADD . /go/src/github.com/kubernetes-incubator/cri-o
|
ADD . /go/src/github.com/kubernetes-incubator/cri-o
|
||||||
|
|
||||||
|
RUN make .install.ostree
|
||||||
|
|
||||||
RUN make test/copyimg/copyimg \
|
RUN make test/copyimg/copyimg \
|
||||||
&& mkdir -p .artifacts/redis-image \
|
&& mkdir -p .artifacts/redis-image \
|
||||||
&& ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json
|
&& ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json
|
||||||
|
|
|
||||||
8
Makefile
8
Makefile
|
|
@ -202,6 +202,14 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
|
||||||
go get -u github.com/cpuguy83/go-md2man; \
|
go get -u github.com/cpuguy83/go-md2man; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
.install.ostree: .gopathok
|
||||||
|
if ! pkg-config ostree-1 2> /dev/null ; then \
|
||||||
|
git clone https://github.com/ostreedev/ostree $(GOPATH)/src/github.com/ostreedev/ostree ; \
|
||||||
|
cd $(GOPATH)/src/github.com/ostreedev/ostree ; \
|
||||||
|
./autogen.sh --prefix=/usr/local; \
|
||||||
|
make all install; \
|
||||||
|
fi
|
||||||
|
|
||||||
.PHONY: \
|
.PHONY: \
|
||||||
binaries \
|
binaries \
|
||||||
clean \
|
clean \
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
- container-selinux
|
- container-selinux
|
||||||
- btrfs-progs-devel
|
- btrfs-progs-devel
|
||||||
- device-mapper-devel
|
- device-mapper-devel
|
||||||
|
- ostree-devel
|
||||||
- glibc-devel
|
- glibc-devel
|
||||||
- gpgme-devel
|
- gpgme-devel
|
||||||
- libassuan-devel
|
- libassuan-devel
|
||||||
|
|
@ -65,6 +66,7 @@
|
||||||
- container-selinux
|
- container-selinux
|
||||||
- btrfs-progs-devel
|
- btrfs-progs-devel
|
||||||
- device-mapper-devel
|
- device-mapper-devel
|
||||||
|
- ostree-devel
|
||||||
- glibc-devel
|
- glibc-devel
|
||||||
- gpgme-devel
|
- gpgme-devel
|
||||||
- libassuan-devel
|
- libassuan-devel
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue