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

Merge pull request #4317 from shin-/release-script-fixes 

Fix docker image build script when using universal wheels
This commit is contained in:
Joffrey F 2017-01-10 17:21:27 -08:00 committed by GitHub
parent 1c1fe89e43 19190ea0df
commit 2091149fee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.run
View File

@ -1,5 +1,6 @@
FROM alpine:3.4
ARG version
RUN apk -U add \
python \
py-pip
@ -7,7 +8,7 @@ RUN apk -U add \
COPY requirements.txt /code/requirements.txt
RUN pip install -r /code/requirements.txt
ADD dist/docker-compose-release-py2.py3-none-any.whl /code/docker-compose
RUN pip install --no-deps /code/docker-compose/docker-compose-*
COPY dist/docker_compose-${version}-py2.py3-none-any.whl /code/
RUN pip install --no-deps /code/docker_compose-${version}-py2.py3-none-any.whl
ENTRYPOINT ["/usr/bin/docker-compose"]

3
script/build/image
View File

@ -12,5 +12,4 @@ VERSION="$(python setup.py --version)"
./script/build/write-git-sha
python setup.py sdist bdist_wheel
cp dist/docker-compose-$VERSION-py2.py3-none-any.whl dist/docker-compose-release-py2.py3-none-any.whl
docker build -t docker/compose:$TAG -f Dockerfile.run .
docker build --build-arg version=$VERSION -t docker/compose:$TAG -f Dockerfile.run .