[sr-dev] git:master:6dd8bfac: travis: use kamailio/pkg-kamailio-docker

Module: kamailio Branch: master Commit: 6dd8bface819b175db84728bfd4ceb9407d5e550 URL: https://github.com/kamailio/kamailio/commit/6dd8bface819b175db84728bfd4ceb9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-30T22:50:10+01:00 travis: use kamailio/pkg-kamailio-docker --- Modified: .travis.yml Modified: test/travis/README.md Modified: test/travis/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/6dd8bface819b175db84728bfd4ceb9… Patch: https://github.com/kamailio/kamailio/commit/6dd8bface819b175db84728bfd4ceb9… --- diff --git a/.travis.yml b/.travis.yml index a05dabd..e95a837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ compiler: services: - docker before_install: - - docker pull linuxmaniac/pkg-kamailio-docker:stretch -script: docker run -v $TRAVIS_BUILD_DIR:/code:rw linuxmaniac/pkg-kamailio-docker:stretch /bin/bash -c "export CC=$CC; cd /code; ./test/travis/build_travis.sh" + - docker pull kamailio/pkg-kamailio-docker:dev-stretch +script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:dev-stretch /bin/bash -c "export CC=$CC; cd /code; ./test/travis/build_travis.sh" branches: only: - 'master' diff --git a/test/travis/README.md b/test/travis/README.md index 3b628c5..57130c1 100644 --- a/test/travis/README.md +++ b/test/travis/README.md @@ -11,8 +11,8 @@ systems. Docker containers ----------------- -The default used container is built at [docker hub](https://hub.docker.com/r/linuxmaniac/pkg-kamailio-docker/) -and it is a Debian Stretch based image done with the following [DockerFile](https://github.com/linuxmaniac/pkg-kamailio-docker/blob/master/… +The default used container is built at [docker hub](https://hub.docker.com/r/kamailio/pkg-kamailio-docker/) +and it is a Debian Stretch based image done with the following [DockerFile](https://github.com/kamailio/pkg-kamailio-docker/blob/master/str… Build Locally ------------- @@ -20,11 +20,13 @@ Build Locally Same steps defined at [.travis.yml](https://github.com/kamailio/kamailio/blob/master/.travis.yml): * Choose the compiler to be used by setting the variable `CC` to `gcc` or `clang` + * Choose version and distribution setting `VERSION` and `DIST` ``` -$ docker pull linuxmaniac/pkg-kamailio-docker:stretch +$ export DIST=stretch VERSION=dev +$ docker pull kamailio/pkg-kamailio-docker:${VERSION}-${DIST} $ docker run \ - -v $(pwd):/code:rw linuxmaniac/pkg-kamailio-docker:stretch \ + -v $(pwd):/code:rw linuxmaniac/pkg-kamailio-docker:${VERSION}-${DIST} \ /bin/bash -c "export CC=gcc; cd /code; ./test/travis/build_travis.sh" ``` @@ -36,7 +38,7 @@ Clean Sources ``` $ docker run \ - -v $(pwd):/code:rw linuxmaniac/pkg-kamailio-docker:stretch \ + -v $(pwd):/code:rw kamailio/pkg-kamailio-docker:${VERSION}-${DIST} \ /bin/bash -c "cd /code; make -f debian/rules clean; rm -rf debian" ``` @@ -45,20 +47,20 @@ Login Inside The Build Environment ``` $ docker run -i -t \ - -v $(pwd):/code:rw linuxmaniac/pkg-kamailio-docker:stretch /bin/bash + -v $(pwd):/code:rw kamailio/pkg-kamailio-docker:${VERSION}-${DIST} /bin/bash ``` Use Other Debian Distributions ------------------------------ -There are several container [images available](https://hub.docker.com/r/linuxmaniac/pkg-kamailio-docker/tags/) already. +There are several container [images available](https://hub.docker.com/r/kamailio/pkg-kamailio-docker/tags/) already. One can just use any of the them by selecting the proper tag: ``` -$ export $DIST=sid -$ docker pull linuxmaniac/pkg-kamailio-docker:$DIST +$ export DIST=sid VERSION=dev +$ docker pull kamailio/pkg-kamailio-docker:${VERSION}-${DIST} $ docker run \ - -v $(pwd):/code:rw linuxmaniac/pkg-kamailio-docker:$DIST \ + -v $(pwd):/code:rw kamailio/pkg-kamailio-docker:${VERSION}-${DIST} \ /bin/bash -c "export CC=$CC; cd /code; DIST=$DIST ./test/travis/build_travis.sh" ``` diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh index 44a0ffe..818508f 100755 --- a/test/travis/build_travis.sh +++ b/test/travis/build_travis.sh @@ -2,7 +2,7 @@ # # build script for travis CI # environment based docker container at -# https://hub.docker.com/r/linuxmaniac/pkg-kamailio-docker/ +# https://hub.docker.com/r/kamailio/pkg-kamailio-docker/ # set -e