diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d6341180976534bec00923aa945b4a51ad9874e..927899b927eb30911993d6ebe73ffbfbba0e64fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,8 +116,10 @@ release:latest: needs: ['test:latest'] script: - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.18 2.18 + - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.18 python3.8 - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.18 latest - crane copy ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.18 ${DOCKER_HUB_REPO}:2.18 + - crane tag ${DOCKER_HUB_REPO}:2.18 python3.8 - crane tag ${DOCKER_HUB_REPO}:2.18 latest release:python2.7: @@ -125,11 +127,11 @@ release:python2.7: needs: ['test:python2.7'] script: - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 2.16 - - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python3.6 - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python2.7 + - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python3.6 - crane copy ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 ${DOCKER_HUB_REPO}:2.16 - - crane tag ${DOCKER_HUB_REPO}:2.16 python3.6 - crane tag ${DOCKER_HUB_REPO}:2.16 python2.7 + - crane tag ${DOCKER_HUB_REPO}:2.16 python3.6 release:2.10: extends: .release diff --git a/README.md b/README.md index 60df85f39ad0856584c66e4251cc8f01b7ba1bbe..c090784a60fe841f4dafdc6befceede2f59788a6 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ This repo builds a Docker image containing Ansible and common dependencies for u Images are tagged with the version of `ansible-core` included in the image. There are also `python<version>` tags if you need to support managed nodes running specific versions of Python. -- `2.18`, `latest` -- `2.16`, `python2.7`, `python3.6` EOL, but kept around for use with managed nodes that only support Python 2.7 +- `2.18`, `python3.8`, `latest` +- `2.16`, `python2.7`, `python3.6` EOL, but kept around for use with managed nodes that only support Python 2.7 or Python 3.6 - `2.10` EOL, but kept around for playbooks that still only work with classic Ansible - `2.9` EOL, but kept around for playbooks that still only work with classic Ansible