From 78f9ff5ecb5236761abf7750c3c01f385fa1a198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Mon, 21 Nov 2022 08:26:22 -0400 Subject: [PATCH 1/2] [REF] Improving documentation. Adding stable/unstable tags. --- .github/workflows/push-develop.yml | 18 ++++++++++++++++++ .github/workflows/push-master.yml | 18 ++++++++++++++++++ .github/workflows/schedule-master.yml | 18 ++++++++++++++++++ README.md | 16 ++++++++++------ README.md.template | 16 ++++++++++------ debian/README.md | 8 ++++---- debian/README.md.template | 8 ++++---- debian/build-image.sh | 10 ++-------- latex/README.md | 4 +++- latex/README.md.template | 4 +++- node/README.md | 2 +- node/README.md.template | 2 +- python/README.md | 6 +++--- python/README.md.template | 6 +++--- scripts/update_node.py | 16 ++++++++++++++-- scripts/update_python.py | 16 ++++++++++++++-- 16 files changed, 126 insertions(+), 42 deletions(-) diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml index c0bbfc23..7d0f7edd 100644 --- a/.github/workflows/push-develop.yml +++ b/.github/workflows/push-develop.yml @@ -28,23 +28,41 @@ jobs: - docker-image-name: "dockershelf/latex:basic" - docker-image-name: "dockershelf/latex:full" - docker-image-name: "dockershelf/python:3.5-bullseye" + docker-image-extra-tags: "dockershelf/python:3.5-stable" - docker-image-name: "dockershelf/python:3.5-sid" + docker-image-extra-tags: "dockershelf/python:3.5-unstable dockershelf/python:3.5" - docker-image-name: "dockershelf/python:3.7-bullseye" + docker-image-extra-tags: "dockershelf/python:3.7-stable" - docker-image-name: "dockershelf/python:3.7-sid" + docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7" - docker-image-name: "dockershelf/python:3.9-bullseye" + docker-image-extra-tags: "dockershelf/python:3.9-stable" - docker-image-name: "dockershelf/python:3.9-sid" + docker-image-extra-tags: "dockershelf/python:3.9-unstable dockershelf/python:3.9" - docker-image-name: "dockershelf/python:3.10-bullseye" + docker-image-extra-tags: "dockershelf/python:3.10-stable" - docker-image-name: "dockershelf/python:3.10-sid" + docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10" - docker-image-name: "dockershelf/python:3.11-bullseye" + docker-image-extra-tags: "dockershelf/python:3.11-stable" - docker-image-name: "dockershelf/python:3.11-sid" + docker-image-extra-tags: "dockershelf/python:3.11-unstable dockershelf/python:3.11" - docker-image-name: "dockershelf/node:12-bullseye" + docker-image-extra-tags: "dockershelf/node:12-stable" - docker-image-name: "dockershelf/node:12-sid" + docker-image-extra-tags: "dockershelf/node:12-unstable dockershelf/node:12" - docker-image-name: "dockershelf/node:14-bullseye" + docker-image-extra-tags: "dockershelf/node:14-stable" - docker-image-name: "dockershelf/node:14-sid" + docker-image-extra-tags: "dockershelf/node:14-unstable dockershelf/node:14" - docker-image-name: "dockershelf/node:16-bullseye" + docker-image-extra-tags: "dockershelf/node:16-stable" - docker-image-name: "dockershelf/node:16-sid" + docker-image-extra-tags: "dockershelf/node:16-unstable dockershelf/node:16" - docker-image-name: "dockershelf/node:18-bullseye" + docker-image-extra-tags: "dockershelf/node:18-stable" - docker-image-name: "dockershelf/node:18-sid" + docker-image-extra-tags: "dockershelf/node:18-unstable dockershelf/node:18" steps: - name: Checkout repo diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index ef309fe8..c48b801d 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -28,23 +28,41 @@ jobs: - docker-image-name: "dockershelf/latex:basic" - docker-image-name: "dockershelf/latex:full" - docker-image-name: "dockershelf/python:3.5-bullseye" + docker-image-extra-tags: "dockershelf/python:3.5-stable" - docker-image-name: "dockershelf/python:3.5-sid" + docker-image-extra-tags: "dockershelf/python:3.5-unstable dockershelf/python:3.5" - docker-image-name: "dockershelf/python:3.7-bullseye" + docker-image-extra-tags: "dockershelf/python:3.7-stable" - docker-image-name: "dockershelf/python:3.7-sid" + docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7" - docker-image-name: "dockershelf/python:3.9-bullseye" + docker-image-extra-tags: "dockershelf/python:3.9-stable" - docker-image-name: "dockershelf/python:3.9-sid" + docker-image-extra-tags: "dockershelf/python:3.9-unstable dockershelf/python:3.9" - docker-image-name: "dockershelf/python:3.10-bullseye" + docker-image-extra-tags: "dockershelf/python:3.10-stable" - docker-image-name: "dockershelf/python:3.10-sid" + docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10" - docker-image-name: "dockershelf/python:3.11-bullseye" + docker-image-extra-tags: "dockershelf/python:3.11-stable" - docker-image-name: "dockershelf/python:3.11-sid" + docker-image-extra-tags: "dockershelf/python:3.11-unstable dockershelf/python:3.11" - docker-image-name: "dockershelf/node:12-bullseye" + docker-image-extra-tags: "dockershelf/node:12-stable" - docker-image-name: "dockershelf/node:12-sid" + docker-image-extra-tags: "dockershelf/node:12-unstable dockershelf/node:12" - docker-image-name: "dockershelf/node:14-bullseye" + docker-image-extra-tags: "dockershelf/node:14-stable" - docker-image-name: "dockershelf/node:14-sid" + docker-image-extra-tags: "dockershelf/node:14-unstable dockershelf/node:14" - docker-image-name: "dockershelf/node:16-bullseye" + docker-image-extra-tags: "dockershelf/node:16-stable" - docker-image-name: "dockershelf/node:16-sid" + docker-image-extra-tags: "dockershelf/node:16-unstable dockershelf/node:16" - docker-image-name: "dockershelf/node:18-bullseye" + docker-image-extra-tags: "dockershelf/node:18-stable" - docker-image-name: "dockershelf/node:18-sid" + docker-image-extra-tags: "dockershelf/node:18-unstable dockershelf/node:18" steps: - name: Checkout repo diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml index bc6cc575..4d37749b 100644 --- a/.github/workflows/schedule-master.yml +++ b/.github/workflows/schedule-master.yml @@ -27,23 +27,41 @@ jobs: - docker-image-name: "dockershelf/latex:basic" - docker-image-name: "dockershelf/latex:full" - docker-image-name: "dockershelf/python:3.5-bullseye" + docker-image-extra-tags: "dockershelf/python:3.5-stable" - docker-image-name: "dockershelf/python:3.5-sid" + docker-image-extra-tags: "dockershelf/python:3.5-unstable dockershelf/python:3.5" - docker-image-name: "dockershelf/python:3.7-bullseye" + docker-image-extra-tags: "dockershelf/python:3.7-stable" - docker-image-name: "dockershelf/python:3.7-sid" + docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7" - docker-image-name: "dockershelf/python:3.9-bullseye" + docker-image-extra-tags: "dockershelf/python:3.9-stable" - docker-image-name: "dockershelf/python:3.9-sid" + docker-image-extra-tags: "dockershelf/python:3.9-unstable dockershelf/python:3.9" - docker-image-name: "dockershelf/python:3.10-bullseye" + docker-image-extra-tags: "dockershelf/python:3.10-stable" - docker-image-name: "dockershelf/python:3.10-sid" + docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10" - docker-image-name: "dockershelf/python:3.11-bullseye" + docker-image-extra-tags: "dockershelf/python:3.11-stable" - docker-image-name: "dockershelf/python:3.11-sid" + docker-image-extra-tags: "dockershelf/python:3.11-unstable dockershelf/python:3.11" - docker-image-name: "dockershelf/node:12-bullseye" + docker-image-extra-tags: "dockershelf/node:12-stable" - docker-image-name: "dockershelf/node:12-sid" + docker-image-extra-tags: "dockershelf/node:12-unstable dockershelf/node:12" - docker-image-name: "dockershelf/node:14-bullseye" + docker-image-extra-tags: "dockershelf/node:14-stable" - docker-image-name: "dockershelf/node:14-sid" + docker-image-extra-tags: "dockershelf/node:14-unstable dockershelf/node:14" - docker-image-name: "dockershelf/node:16-bullseye" + docker-image-extra-tags: "dockershelf/node:16-stable" - docker-image-name: "dockershelf/node:16-sid" + docker-image-extra-tags: "dockershelf/node:16-unstable dockershelf/node:16" - docker-image-name: "dockershelf/node:18-bullseye" + docker-image-extra-tags: "dockershelf/node:18-stable" - docker-image-name: "dockershelf/node:18-sid" + docker-image-extra-tags: "dockershelf/node:18-unstable dockershelf/node:18" steps: - name: Checkout repo diff --git a/README.md b/README.md index 6001a033..e5db9847 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,19 @@ Current version: 3.0.0 Images are updated, tested and published *weekly* via a [Github Actions workflow](https://github.com/Dockershelf/dockershelf/actions). -## How to download +## About stable/unstable images + +Excepting debian and latex images, all images have an stable/unstable version. Stable images are based on debian stable, which are ideal for production applications; Unstable images are based on debian sid, which are designed for development stages. + +## How to use Pull one of the available images and start hacking! ```bash -docker pull [docker image name] -docker run -it [docker image name] bash +docker pull +docker run -it bash ``` -[docker image name] is the desired image to download, for example dockershelf/python:2.7. +<image> is the desired image to download, for example dockershelf/python:2.7. ## How to build locally @@ -31,10 +35,10 @@ git clone https://github.com/Dockershelf/dockershelf Run the build script in the root folder of your local copy. Remember to have docker installed and make sure your user has proper privileges to execute `docker build`. ```bash -bash build-image.sh [docker image name] +bash build-image.sh ``` -[docker image name] is the desired image to build, for example dockershelf/debian:sid. +<image> is the desired image to build, for example dockershelf/debian:sid. ## Shelves diff --git a/README.md.template b/README.md.template index 6641f330..7dc78f9e 100644 --- a/README.md.template +++ b/README.md.template @@ -10,15 +10,19 @@ Current version: 3.0.0 Images are updated, tested and published *weekly* via a [Github Actions workflow](https://github.com/Dockershelf/dockershelf/actions). -## How to download +## About stable/unstable images + +Excepting debian and latex images, all images have an stable/unstable version. Stable images are based on debian stable, which are ideal for production applications; Unstable images are based on debian sid, which are designed for development stages. + +## How to use Pull one of the available images and start hacking! ```bash -docker pull [docker image name] -docker run -it [docker image name] bash +docker pull +docker run -it bash ``` -[docker image name] is the desired image to download, for example dockershelf/python:2.7. +<image> is the desired image to download, for example dockershelf/python:2.7. ## How to build locally @@ -31,10 +35,10 @@ git clone https://github.com/Dockershelf/dockershelf Run the build script in the root folder of your local copy. Remember to have docker installed and make sure your user has proper privileges to execute `docker build`. ```bash -bash build-image.sh [docker image name] +bash build-image.sh ``` -[docker image name] is the desired image to build, for example dockershelf/debian:sid. +<image> is the desired image to build, for example dockershelf/debian:sid. ## Shelves diff --git a/debian/README.md b/debian/README.md index 5a17bb2d..2d21fc1d 100644 --- a/debian/README.md +++ b/debian/README.md @@ -23,7 +23,7 @@ The base filesystem is created with [`debian/build-image.sh`](https://github.com However, we explain the overall process here: 1. Built `FROM scratch`. -2. Labelled according to [label-schema.org](http://label-schema.org). +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. The base filesystem is built with `debootstrap` using the following command. debootstrap --verbose --variant minbase --arch amd64 --no-check-gpg --no-check-certificate @@ -112,12 +112,12 @@ However, we explain the overall process here: * `/etc/bash.bashrc`: Configure bash-completion and colorful prompt. -5. Install `iproute`, `inetutils-ping`, `locales`, `curl`, `ca-certificates` and `bash-completion` packages. +5. Install `iproute2`, `inetutils-ping`, `locales`, `curl`, `ca-certificates` and `bash-completion` packages. 6. Configure locales. 7. Delete unnecessary files to shrink image. -## Made with :heart: and :hamburger: +## Made with πŸ’– and πŸ” -![Banner](https://github.com/Dockershelf/dockershelf/blob/develop/images/author-banner.svg) +![Banner](https://raw.githubusercontent.com/Dockershelf/dockershelf/develop/images/author-banner.svg) > Web [luisalejandro.org](http://luisalejandro.org/) Β· GitHub [@LuisAlejandro](https://github.com/LuisAlejandro) Β· Twitter [@LuisAlejandro](https://twitter.com/LuisAlejandro) \ No newline at end of file diff --git a/debian/README.md.template b/debian/README.md.template index e4d67849..c76fae30 100644 --- a/debian/README.md.template +++ b/debian/README.md.template @@ -20,7 +20,7 @@ The base filesystem is created with [`debian/build-image.sh`](https://github.com However, we explain the overall process here: 1. Built `FROM scratch`. -2. Labelled according to [label-schema.org](http://label-schema.org). +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. The base filesystem is built with `debootstrap` using the following command. debootstrap --verbose --variant minbase --arch amd64 --no-check-gpg --no-check-certificate @@ -109,12 +109,12 @@ However, we explain the overall process here: * `/etc/bash.bashrc`: Configure bash-completion and colorful prompt. -5. Install `iproute`, `inetutils-ping`, `locales`, `curl`, `ca-certificates` and `bash-completion` packages. +5. Install `iproute2`, `inetutils-ping`, `locales`, `curl`, `ca-certificates` and `bash-completion` packages. 6. Configure locales. 7. Delete unnecessary files to shrink image. -## Made with :heart: and :hamburger: +## Made with πŸ’– and πŸ” -![Banner](https://github.com/Dockershelf/dockershelf/blob/develop/images/author-banner.svg) +![Banner](https://raw.githubusercontent.com/Dockershelf/dockershelf/develop/images/author-banner.svg) > Web [luisalejandro.org](http://luisalejandro.org/) Β· GitHub [@LuisAlejandro](https://github.com/LuisAlejandro) Β· Twitter [@LuisAlejandro](https://twitter.com/LuisAlejandro) \ No newline at end of file diff --git a/debian/build-image.sh b/debian/build-image.sh index 83e0ecc3..53a11c88 100755 --- a/debian/build-image.sh +++ b/debian/build-image.sh @@ -48,12 +48,6 @@ if [ "$( id -u )" != "0" ]; then exit 1 fi -if [ "${DEBIAN_SUITE}" == "oldstable" ] || [ "${DEBIAN_SUITE}" == "oldoldstable" ]; then - MERGED_USR="--no-merged-usr" -else - MERGED_USR="--merged-usr" -fi - # Clean previous builds if [ -d "${TARGET}" ]; then rm -rf "${TARGET}" @@ -61,12 +55,12 @@ fi msginfo "Downloading packages for base filesystem ..." debootstrap --verbose --variant "${VARIANT}" --arch "${ARCH}" \ - --download-only --no-check-gpg --no-check-certificate ${MERGED_USR} \ + --download-only --no-check-gpg --no-check-certificate --merged-usr \ "${DEBIAN_RELEASE}" "${TARGET}" msginfo "Building base filesystem ..." debootstrap --verbose --variant "${VARIANT}" --arch "${ARCH}" \ - --no-check-gpg --no-check-certificate ${MERGED_USR} \ + --no-check-gpg --no-check-certificate --merged-usr \ "${DEBIAN_RELEASE}" "${TARGET}" msginfo "Configuring base filesystem ..." diff --git a/latex/README.md b/latex/README.md index 089834c3..77333bc6 100644 --- a/latex/README.md +++ b/latex/README.md @@ -15,7 +15,9 @@ ## Building process -The Latex images are very simple, they're just debian images with `texlive-fonts-recommended`, `texlive-latex-base`, `texlive-latex-extra` and `latex-xcolor` debian packages installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/sid/Dockerfile) for details. +The Latex basic image is a debian unstable image with `texlive-fonts-recommended`, `texlive-latex-base`, `texlive-latex-extra` and `texlive-latex-recommended` packages installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/basic/Dockerfile) for details. + +The Latex full image is a debian unstable image with `texlive-full` package installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/full/Dockerfile) for details. ## Made with πŸ’– and πŸ” diff --git a/latex/README.md.template b/latex/README.md.template index 9d4114d0..d04c80ea 100644 --- a/latex/README.md.template +++ b/latex/README.md.template @@ -14,7 +14,9 @@ ## Building process -The Latex images are very simple, they're just debian images with `texlive-fonts-recommended`, `texlive-latex-base`, `texlive-latex-extra` and `latex-xcolor` debian packages installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/sid/Dockerfile) for details. +The Latex basic image is a debian unstable image with `texlive-fonts-recommended`, `texlive-latex-base`, `texlive-latex-extra` and `texlive-latex-recommended` packages installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/basic/Dockerfile) for details. + +The Latex full image is a debian unstable image with `texlive-full` package installed. Check out the [Dockerfile](https://github.com/Dockershelf/dockershelf/blob/master/latex/full/Dockerfile) for details. ## Made with πŸ’– and πŸ” diff --git a/node/README.md b/node/README.md index 9b81b2fe..42ce61f4 100644 --- a/node/README.md +++ b/node/README.md @@ -28,7 +28,7 @@ Each node release is installed using the [nodesource scripts](https://nodejs.org We'll explain the overall process here: 1. Built `FROM dockershelf/debian:`. -2. Labelled according to [label-schema.org](http://label-schema.org). +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. Install developer tools and build depends to handle the nodesource script install. 4. Install Node. 5. Shrink image by deleting unnecessary files. diff --git a/node/README.md.template b/node/README.md.template index 8ed776bc..145621d7 100644 --- a/node/README.md.template +++ b/node/README.md.template @@ -21,7 +21,7 @@ Each node release is installed using the [nodesource scripts](https://nodejs.org We'll explain the overall process here: 1. Built `FROM dockershelf/debian:`. -2. Labelled according to [label-schema.org](http://label-schema.org). +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. Install developer tools and build depends to handle the nodesource script install. 4. Install Node. 5. Shrink image by deleting unnecessary files. diff --git a/python/README.md b/python/README.md index 31dbcd95..60f94ee3 100644 --- a/python/README.md +++ b/python/README.md @@ -25,12 +25,12 @@ The Python images are built using a bash script [`python/build-image.sh`](https://github.com/Dockershelf/dockershelf/blob/master/python/build-image.sh), you can check it out for details. -Each python release is downloaded and installed from the debian official repositories. Some releases are not compiled against Debian Sid libraries, so some potentially old libraries could be installed in the process. +Each python release is downloaded and installed from the [deadsnakes ppa](https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa). We'll explain the overall process here: -1. Built `FROM dockershelf/debian:sid`. -2. Labelled according to [label-schema.org](http://label-schema.org). +1. Built `FROM dockershelf/debian:`. +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. Install developer tools to handle the package installation. 4. Install Python. 5. Uninstall developer tools and orphan packages. diff --git a/python/README.md.template b/python/README.md.template index 426ff141..91b01081 100644 --- a/python/README.md.template +++ b/python/README.md.template @@ -16,12 +16,12 @@ The Python images are built using a bash script [`python/build-image.sh`](https://github.com/Dockershelf/dockershelf/blob/master/python/build-image.sh), you can check it out for details. -Each python release is downloaded and installed from the debian official repositories. Some releases are not compiled against Debian Sid libraries, so some potentially old libraries could be installed in the process. +Each python release is downloaded and installed from the [deadsnakes ppa](https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa). We'll explain the overall process here: -1. Built `FROM dockershelf/debian:sid`. -2. Labelled according to [label-schema.org](http://label-schema.org). +1. Built `FROM dockershelf/debian:`. +2. Labelled according to [label-schema.org](http://label-schema.org) and [opencontainers specification](https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys). 3. Install developer tools to handle the package installation. 4. Install Python. 5. Uninstall developer tools and orphan packages. diff --git a/scripts/update_node.py b/scripts/update_node.py index c052f397..fca250af 100644 --- a/scripts/update_node.py +++ b/scripts/update_node.py @@ -57,7 +57,12 @@ def update_node(basedir): '?colorA=22313f&colorB=4a637b&cacheSeconds=900') size_url_holder = ('https://hub.docker.com/r/dockershelf/node') matrix_str = ( - ' - docker-image-name: "dockershelf/node:{0}"') + ' - docker-image-name: "dockershelf/node:{0}"' + '\n docker-image-extra-tags: "dockershelf/node:{1}"') + matrix_str_main = ( + ' - docker-image-name: "dockershelf/node:{0}"' + '\n docker-image-extra-tags: "dockershelf/node:{1} ' + 'dockershelf/node:{2}"') node_readme_tablelist_holder = ('|[`{0}`]({1})' '|`{2}`' '|[![]({3})]({4})' @@ -75,6 +80,8 @@ def update_node(basedir): logger.info('Processing Node {0} ({1})'.format( nodever, debian_version)) node_version = '{0}-{1}'.format(nodever, debian_version) + node_version_stable = '{0}-{1}'.format(nodever, 'stable') + node_version_unstable = '{0}-{1}'.format(nodever, 'unstable') node_version_dir = os.path.join(nodedir, node_version) node_dockerfile = os.path.join(node_version_dir, 'Dockerfile') @@ -87,7 +94,12 @@ def update_node(basedir): size_badge = size_badge_holder.format(node_version) size_url = size_url_holder.format(node_version) - matrix.append(matrix_str.format(node_version)) + if debian_version == 'sid': + matrix.append(matrix_str_main.format( + node_version, node_version_unstable, nodever)) + else: + matrix.append(matrix_str.format(node_version, + node_version_stable)) node_readme_tablelist.append( node_readme_tablelist_holder.format( diff --git a/scripts/update_python.py b/scripts/update_python.py index f1c7fda7..23322aba 100644 --- a/scripts/update_python.py +++ b/scripts/update_python.py @@ -57,7 +57,12 @@ def update_python(basedir): '?colorA=22313f&colorB=4a637b&cacheSeconds=900') size_url_holder = ('https://hub.docker.com/r/dockershelf/python') matrix_str = ( - ' - docker-image-name: "dockershelf/python:{0}"') + ' - docker-image-name: "dockershelf/python:{0}"' + '\n docker-image-extra-tags: "dockershelf/python:{1}"') + matrix_str_main = ( + ' - docker-image-name: "dockershelf/python:{0}"' + '\n docker-image-extra-tags: "dockershelf/python:{1} ' + 'dockershelf/python:{2}"') python_readme_tablelist_holder = ('|[`{0}`]({1})' '|`{2}`' '|[![]({3})]({4})' @@ -75,6 +80,8 @@ def update_python(basedir): logger.info('Processing Python {0} ({1})'.format( pyver, debian_version)) python_version = '{0}-{1}'.format(pyver, debian_version) + python_version_stable = '{0}-{1}'.format(pyver, 'stable') + python_version_unstable = '{0}-{1}'.format(pyver, 'unstable') python_version_dir = os.path.join(pythondir, python_version) python_dockerfile = os.path.join(python_version_dir, 'Dockerfile') @@ -87,7 +94,12 @@ def update_python(basedir): size_badge = size_badge_holder.format(python_version) size_url = size_url_holder.format(python_version) - matrix.append(matrix_str.format(python_version)) + if debian_version == 'sid': + matrix.append(matrix_str_main.format( + python_version, python_version_unstable, pyver)) + else: + matrix.append(matrix_str.format(python_version, + python_version_stable)) python_readme_tablelist.append( python_readme_tablelist_holder.format( From 4805b7005afcbc3e13941dc04e86b48c6e4a5531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Mon, 21 Nov 2022 08:45:52 -0400 Subject: [PATCH 2/2] Updating Changelog and version. --- .bumpversion.cfg | 2 +- HISTORY.md | 9 ++++++++- README.md | 2 +- README.md.template | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4d406b23..aab271b5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.0 +current_version = 3.0.1 tag_name = {new_version} commit = True tag = True diff --git a/HISTORY.md b/HISTORY.md index ddbae6cf..49b7f48f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,14 @@ # Changelog -## 3.0.0 (2022-11-21) +## 3.0.1 (2022-11-21) + +### Changed + +* Improving documentation. Adding stable/unstable tags. [Luis Alejandro MartΓ­nez Faneyth] + + +## 3.0 (2022-11-21) ### Changed diff --git a/README.md b/README.md index e5db9847..61cdacc8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![](https://img.shields.io/github/release/Dockershelf/dockershelf.svg)](https://github.com/Dockershelf/dockershelf/releases) [![](https://img.shields.io/github/workflow/status/Dockershelf/dockershelf/Schedule%20(master%20branch))](https://github.com/Dockershelf/dockershelf/actions/workflows/schedule-master.yml) [![](https://img.shields.io/discord/809504357359157288)](https://discord.gg/4Wc7xphH5e) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf) -Current version: 3.0.0 +Current version: 3.0.1 *Dockershelf* is a repository that serves as a collector for docker recipes that are universal, efficient and slim. We keep adding "shelves", which are holders for the different versions of a popular language or application. diff --git a/README.md.template b/README.md.template index 7dc78f9e..f83bfb9c 100644 --- a/README.md.template +++ b/README.md.template @@ -4,7 +4,7 @@ [![](https://img.shields.io/github/release/Dockershelf/dockershelf.svg)](https://github.com/Dockershelf/dockershelf/releases) [![](https://img.shields.io/github/workflow/status/Dockershelf/dockershelf/Schedule%20(master%20branch))](https://github.com/Dockershelf/dockershelf/actions/workflows/schedule-master.yml) [![](https://img.shields.io/discord/809504357359157288)](https://discord.gg/4Wc7xphH5e) [![](https://cla-assistant.io/readme/badge/Dockershelf/dockershelf)](https://cla-assistant.io/Dockershelf/dockershelf) -Current version: 3.0.0 +Current version: 3.0.1 *Dockershelf* is a repository that serves as a collector for docker recipes that are universal, efficient and slim. We keep adding "shelves", which are holders for the different versions of a popular language or application.