From 836e2b7c4dd9c65b7e829104d116ee2050021343 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Tue, 21 Apr 2020 10:45:40 +0200 Subject: [PATCH] General bumps Signed-off-by: Ulysses Souza --- Dockerfile | 8 ++++---- Jenkinsfile | 2 +- README.md | 2 +- Release.Jenkinsfile | 2 +- script/run/run.sh | 2 +- script/setup/osx | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 918c6876b..1f7608e24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG DOCKER_VERSION=19.03.5 -ARG PYTHON_VERSION=3.7.6 +ARG DOCKER_VERSION=19.03.8 +ARG PYTHON_VERSION=3.7.7 ARG BUILD_ALPINE_VERSION=3.11 ARG BUILD_DEBIAN_VERSION=slim-stretch -ARG RUNTIME_ALPINE_VERSION=3.11.3 -ARG RUNTIME_DEBIAN_VERSION=stretch-20191224-slim +ARG RUNTIME_ALPINE_VERSION=3.11.5 +ARG RUNTIME_DEBIAN_VERSION=stretch-20200414-slim ARG BUILD_PLATFORM=alpine diff --git a/Jenkinsfile b/Jenkinsfile index 5dd1101c2..127a26c7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ #!groovy -def dockerVersions = ['19.03.5'] +def dockerVersions = ['19.03.8'] def baseImages = ['alpine', 'debian'] def pythonVersions = ['py37'] diff --git a/README.md b/README.md index 27c8dcb34..18f7e1bc1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Docker Compose ============== ![Docker Compose](logo.png?raw=true "Docker Compose Logo") -## :exclamation: The docker-compose project announces that as Python 2 reaches it's EOL, versions 1.25.x will be the last to support it. For more information, please refer to this [issue](https://github.com/docker/compose/issues/6890). +## :exclamation: The docker-compose project announces that as Python 2 has reached it's EOL, versions 1.26.x will be the last to support it. For more information, please refer to this [issue](https://github.com/docker/compose/issues/6890). Compose is a tool for defining and running multi-container Docker applications. With Compose, you use a Compose file to configure your application's services. diff --git a/Release.Jenkinsfile b/Release.Jenkinsfile index 953e19e4d..8aa741e56 100644 --- a/Release.Jenkinsfile +++ b/Release.Jenkinsfile @@ -1,6 +1,6 @@ #!groovy -def dockerVersions = ['19.03.5', '18.09.9'] +def dockerVersions = ['19.03.8', '18.09.9'] def baseImages = ['alpine', 'debian'] def pythonVersions = ['py37'] diff --git a/script/run/run.sh b/script/run/run.sh index 7df5fe979..cd566f334 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.25.1" +VERSION="1.25.5" IMAGE="docker/compose:$VERSION" diff --git a/script/setup/osx b/script/setup/osx index 00ae929b9..678b7f22a 100755 --- a/script/setup/osx +++ b/script/setup/osx @@ -13,13 +13,13 @@ if ! [ ${DEPLOYMENT_TARGET} == "$(macos_version)" ]; then SDK_SHA1=dd228a335194e3392f1904ce49aff1b1da26ca62 fi -OPENSSL_VERSION=1.1.1f +OPENSSL_VERSION=1.1.1g OPENSSL_URL=https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -OPENSSL_SHA1=238e001ea1fbf19ede43e36209c37c1a636bb51f +OPENSSL_SHA1=b213a293f2127ec3e323fb3cfc0c9807664fd997 -PYTHON_VERSION=3.7.6 +PYTHON_VERSION=3.7.7 PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz -PYTHON_SHA1=4642680fbf9a9a5382597dc0e9faa058fdfd94e2 +PYTHON_SHA1=8e9968663a214aea29659ba9dfa959e8a7d82b39 # # Install prerequisites.