diff --git a/Dockerfile b/Dockerfile index e224a6f..992bf9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,8 +37,9 @@ RUN \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ - pip3 install virtualenv==16.2.0 && \ - pip3 install tox==2.9.1 && \ + pip3 install -U pip && \ + pip install -U --ignore-installed virtualenv==20.0.30 && \ + pip install -U --ignore-installed tox==3.19.0 && \ PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \ sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \ tox --notest && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1847053..f1e6c1b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -37,8 +37,9 @@ RUN \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ - pip3 install virtualenv==16.2.0 && \ - pip3 install tox==2.9.1 && \ + pip3 install -U pip && \ + pip install -U --ignore-installed virtualenv==20.0.30 && \ + pip install -U --ignore-installed tox==3.19.0 && \ PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \ sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \ tox --notest && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0a27eef..61cc031 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -37,8 +37,9 @@ RUN \ git clone https://github.com/docker/compose.git && \ cd /compose && \ git checkout "${COMPOSE_VERSION}" && \ - pip3 install virtualenv==16.2.0 && \ - pip3 install tox==2.9.1 && \ + pip3 install -U pip && \ + pip install -U --ignore-installed virtualenv==20.0.30 && \ + pip install -U --ignore-installed tox==3.19.0 && \ PY_ARG=$(printf "$(python3 -V)" | awk '{print $2}' | awk 'BEGIN{FS=OFS="."} NF--' | sed 's|\.||g' | sed 's|^|py|g') && \ sed -i "s|envlist = .*|envlist = ${PY_ARG},pre-commit|g" tox.ini && \ tox --notest && \ diff --git a/README.md b/README.md index c31313f..d552c70 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.09.20:** - Bump tox and virtualenv versions. * **06.07.20:** - Publish docker-compose and docker-cli binaries in Github releases. * **01.07.20:** - Release alpine based images at `alpine` tag. * **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version. diff --git a/readme-vars.yml b/readme-vars.yml index 3bb4001..a1882f6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -133,6 +133,7 @@ full_custom_readme: | ## Versions + * **12.09.20:** - Bump tox and virtualenv versions. * **06.07.20:** - Publish docker-compose and docker-cli binaries in Github releases. * **01.07.20:** - Release alpine based images at `alpine` tag. * **04.06.20:** - Bump docker-cli to 19.03.8, auto-detect python3 version. diff --git a/run.sh b/run.sh index 8f0bc95..e653140 100644 --- a/run.sh +++ b/run.sh @@ -13,13 +13,16 @@ # You can add additional volumes (or any docker run options) using # the $COMPOSE_OPTIONS environment variable. # +# You can set a specific image tag from Docker Hub, such as "1.26.2-ls9", or "alpine" +# using the $DOCKER_COMPOSE_IMAGE_TAG environment variable (defaults to "latest") +# set -e -VERSION="latest" # can be set to a specific version tag from docker hub, such as "1.25.5", or "alpine" -IMAGE="linuxserver/docker-compose:$VERSION" - +# set image tag to latest if not globally set +DOCKER_COMPOSE_IMAGE_TAG="${DOCKER_COMPOSE_IMAGE_TAG:-latest}" +IMAGE="linuxserver/docker-compose:$DOCKER_COMPOSE_IMAGE_TAG" # Setup options for connecting to docker host if [ -z "$DOCKER_HOST" ]; then