docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #661 from bfirsh/add-entrypoint-to-dockerfile 

Add fig as entrypoint to Dockerfile
This commit is contained in:
Ben Firshman 2014-12-08 21:32:06 +00:00
parent 9a04ae0ddf bb85e238e0
commit d18cfa1c98
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -13,3 +13,5 @@ ADD . /code/
RUN python setup.py install RUN python setup.py install
RUN chown -R user /code/ RUN chown -R user /code/
ENTRYPOINT ["/usr/local/bin/fig"]

4
script/build-linux
View File

@ -3,6 +3,6 @@ set -ex
mkdir -p `pwd`/dist mkdir -p `pwd`/dist
chmod 777 `pwd`/dist chmod 777 `pwd`/dist
docker build -t fig . docker build -t fig .
docker run -u user -v `pwd`/dist:/code/dist fig pyinstaller -F bin/fig docker run -u user -v `pwd`/dist:/code/dist --entrypoint pyinstaller fig -F bin/fig
mv dist/fig dist/fig-Linux-x86_64 mv dist/fig dist/fig-Linux-x86_64
docker run -u user -v `pwd`/dist:/code/dist fig dist/fig-Linux-x86_64 --version docker run -u user -v `pwd`/dist:/code/dist --entrypoint dist/fig-Linux-x86_64 fig --version

4
script/test
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
docker build -t fig . docker build -t fig .
docker run -v /var/run/docker.sock:/var/run/docker.sock fig flake8 fig docker run -v /var/run/docker.sock:/var/run/docker.sock --entrypoint flake8 fig fig
docker run -v /var/run/docker.sock:/var/run/docker.sock fig nosetests $@ docker run -v /var/run/docker.sock:/var/run/docker.sock --entrypoint nosetests fig $@