Upgrade Docker Compose from 1.24 to 1.26 for main Docker images

This commit is contained in:
Tortue Torche 2020-07-08 14:46:32 +02:00
parent 111dd9c42b
commit c6b81dae42
2 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ RUN set -e; \
bash ca-certificates gettext jq \ bash ca-certificates gettext jq \
py3-pip python3-dev libc-dev libffi-dev openssl-dev gcc make; \ py3-pip python3-dev libc-dev libffi-dev openssl-dev gcc make; \
\ \
pip3 --no-cache-dir install 'docker-compose>=1.24.1,<1.25.0' 'httpie>=1.0.3,<1.1.0'; \ pip3 --no-cache-dir install 'docker-compose>=1.26.2,<1.27.0' 'httpie>=1.0.3,<1.1.0'; \
\ \
apk del python3-dev libc-dev libffi-dev openssl-dev gcc make; \ apk del python3-dev libc-dev libffi-dev openssl-dev gcc make; \
rm -rf /tmp/src rm -rf /tmp/src

View File

@ -5,7 +5,7 @@ RUN set -e; \
apt-get install \ apt-get install \
ca-certificates gettext-base httpie jq curl -yqq; \ ca-certificates gettext-base httpie jq curl -yqq; \
\ \
curl -fL "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose; \ curl -fL "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose; \
chmod +x /usr/local/bin/docker-compose; \ chmod +x /usr/local/bin/docker-compose; \
\ \
apt-get purge curl -y; \ apt-get purge curl -y; \