diff --git a/.travis.yml b/.travis.yml index 23e555b5..d417bf0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,16 @@ script: # in future, we'll just pull a pre-built image to speed up build times - docker build -f ci/Dockerfiles/$BUILD_ENV.dockerfile -t test_img . # use test_img to generate rpm / deb packages (cmake). drop the output in /build_artifacts - - docker run -v $TRAVIS_BUILD_DIR:/root/assimilation/src -v /tmp/ba:/build_artifacts test_img touch /build_artifacts/test + # path-to-source-directory = /root/assimilation/src + # path-to-binary-directory = /root/assimilation/bin + # path-to-build-artifacts = /root/assimilation/ba + - | + docker run \ + -v $TRAVIS_BUILD_DIR:/root/assimilation/src \ + -v /tmp/bin:/root/assimilation/bin \ + -v /tmp/ba:/root/assimilation/ba \ + test_img \ + bash -c "cmake ../src && make install" # test the new packages in a stock image (install and run tests) - - docker run -v /tmp/ba:/packages $STOCK ls -al /packages + # - docker run -v /tmp/ba:/packages $STOCK ls -al /packages # upload to artifactory diff --git a/ci/Dockerfiles/ubuntu1804.dockerfile b/ci/Dockerfiles/ubuntu1804.dockerfile index 61780117..fc5802a7 100644 --- a/ci/Dockerfiles/ubuntu1804.dockerfile +++ b/ci/Dockerfiles/ubuntu1804.dockerfile @@ -1 +1,14 @@ FROM ubuntu:18.04 +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update && apt-get install -y \ + build-essential \ + cmake \ + pkg-config \ + python-pip \ + libglib2.0-dev \ + libpcap-dev \ + libsodium-dev \ + git \ + && rm -rf /var/lib/apt/lists/* +RUN pip install -e git+https://github.com/olsonse/ctypesgen#egg=ctypesgen +WORKDIR /root/assimilation/bin