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 #4571 from shin-/marcosnils-master 

Improve Dockerfile.run
This commit is contained in:
Joffrey F 2017-03-06 15:57:59 -08:00 committed by GitHub
parent 31b2d9176b 44653f2812
commit 02a7b6bacc
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile.run
View File

@ -1,14 +1,14 @@
FROM alpine:3.4
FROM alpine:3.4
ARG version
RUN apk -U add \
python \
py-pip
ENV GLIBC 2.23-r3
COPY requirements.txt /code/requirements.txt
RUN pip install -r /code/requirements.txt
RUN apk update && apk add --no-cache openssl ca-certificates && \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC/glibc-$GLIBC.apk && \
apk add --no-cache glibc-$GLIBC.apk && rm glibc-$GLIBC.apk && \
ln -s /lib/libz.so.1 /usr/glibc-compat/lib/ && \
ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib
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
COPY dist/docker-compose-Linux-x86_64 /usr/local/bin/docker-compose
ENTRYPOINT ["/usr/bin/docker-compose"]
ENTRYPOINT ["docker-compose"]

4
script/build/image
View File

@ -8,8 +8,10 @@ if [ -z "$1" ]; then
fi
TAG=$1
VERSION="$(python setup.py --version)"
./script/build/write-git-sha
python setup.py sdist bdist_wheel
docker build --build-arg version=$VERSION -t docker/compose:$TAG -f Dockerfile.run .
./script/build/linux
docker build -t docker/compose:$TAG -f Dockerfile.run .