Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version to 1.24.0-rc1 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump version to 1.24.0-rc1 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY ./vendor/qemu-bin /usr/bin/
RUN [ "cross-build-start" ]

# Set the versions
ENV DOCKER_COMPOSE_VER 1.22.0
ENV DOCKER_COMPOSE_VER 1.24.0-rc1
# docker-compose requires pyinstaller 3.3.1 (check github.com/docker/compose/requirements-build.txt)
# If this changes, you may need to modify the version of "six" below
ENV PYINSTALLER_VER 3.3.1
Expand All @@ -18,6 +18,7 @@ ENV SIX_VER 1.11.0

# Install dependencies
# RUN apt-get update && apt-get install -y
RUN pip install --upgrade pip
RUN pip install six==$SIX_VER

# Compile the pyinstaller "bootloader"
Expand All @@ -34,7 +35,7 @@ RUN git clone https://github.com/docker/compose.git . \

# Run the build steps (taken from github.com/docker/compose/script/build/linux-entrypoint)
RUN mkdir ./dist \
&& pip install -q -r requirements.txt -r requirements-build.txt \
&& pip install -r requirements.txt -r requirements-build.txt \
&& ./script/build/write-git-sha \
&& pyinstaller docker-compose.spec \
&& mv dist/docker-compose ./docker-compose-$(uname -s)-$(uname -m)
Expand Down