travis changes

This commit is contained in:
Jason Rivers 2016-02-16 16:34:10 +00:00
parent 52e488723d
commit 155f74fc06
2 changed files with 11 additions and 7 deletions

View file

@ -10,7 +10,4 @@ install:
script:
- ./build.sh
- docker images
- docker run -d --name docker-nginx-rtmp -p 1935:1935 -t docker-nginx-rtmp:latest
- docker ps -a

View file

@ -1,20 +1,27 @@
#!/bin/bash
set -e
DOCKER_RUN_IMAGE=nginx-rtmp
DOCKER_BUILD_IMAGE=nginx-build
rm -f nginx.tar.gz
cd build
docker build -t nginx-build .
docker build -t ${DOCKER_BUILD_IMAGE} .
cd ..
DID=`docker create nginx-build`
DID=`docker create ${DOCKER_BUILD_IMAGE}`
docker cp ${DID}:/tmp/nginx.tar.gz ./
docker rm ${DID}
docker rmi nginx-build
docker rmi ${DOCKER_BUILD_IMAGE}
docker build -t nginx-rtmp .
docker build -t ${DOCKER_RUN_IMAGE} .
docker images
docker run -d --name ${DOCKER_RUN_IMAGE} -p 1935:1935 -t ${DOCKER_RUN_IMAGE}
docker ps -a