Make c8-py310 image default one.

riga · Dec 30, 2022 · a84fea3 · a84fea3
1 parent eef8289
commit a84fea3
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/deploy_images.yml b/.github/workflows/deploy_images.yml
@@ -168,7 +168,7 @@ jobs:
           path: docker
           dockerfile: docker/Dockerfile_centos8_py39
           repository: riga/law
-          tags: c8-py39,c8-py3,c8,py39,py3,latest
+          tags: c8-py39,py39
           push: ${{ github.event.inputs.build_only != 'true' }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -188,7 +188,7 @@ jobs:
           path: docker
           dockerfile: docker/Dockerfile_centos7_py310
           repository: riga/law
-          tags: c7-py310,py310
+          tags: c7-py310
           push: ${{ github.event.inputs.build_only != 'true' }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -208,7 +208,7 @@ jobs:
           path: docker
           dockerfile: docker/Dockerfile_centos8_py310
           repository: riga/law
-          tags: c8-py310
+          tags: c8-py310,c8-py3,c8,py310,py3,latest
           push: ${{ github.event.inputs.build_only != 'true' }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/README.rst b/README.rst
@@ -213,27 +213,29 @@ Tests
 To run and test law, there are various docker `riga/law` images available on the `DockerHub <https://cloud.docker.com/u/riga/repository/docker/riga/law>`__, corresponding to different OS and Python versions.
 
 
-+----------+--------+----------------------------------------+
-|    OS    | Python |                  Tags                  |
-+==========+========+========================================+
-| Centos 8 |    3.9 | c8-py39, c8-py3, c8, py39, py3, latest |
-+----------+--------+----------------------------------------+
-| Centos 8 |    3.8 | c8-py38, py38                          |
-+----------+--------+----------------------------------------+
-| Centos 8 |    3.7 | c8-py37, py37                          |
-+----------+--------+----------------------------------------+
-| Centos 7 |   3.10 | c7-py310, py310                        |
-+----------+--------+----------------------------------------+
-| Centos 7 |    3.9 | c7-py39, c7-py3, c7                    |
-+----------+--------+----------------------------------------+
-| Centos 7 |    3.8 | c7-py38                                |
-+----------+--------+----------------------------------------+
-| Centos 7 |    3.7 | c7-py37                                |
-+----------+--------+----------------------------------------+
-| Centos 7 |    3.6 | c7-py36, py36                          |
-+----------+--------+----------------------------------------+
-| Centos 7 |    2.7 | c7-py27, c7-py2, py27, py2             |
-+----------+--------+----------------------------------------+
++----------+--------+------------------------------------------+
+|    OS    | Python |                   Tags                   |
++==========+========+==========================================+
+| Centos 8 |   3.10 | c8-py310, c8-py3, c8, py310, py3, latest |
++----------+--------+------------------------------------------+
+| Centos 8 |    3.9 | c8-py39, py39                            |
++----------+--------+------------------------------------------+
+| Centos 8 |    3.8 | c8-py38, py38                            |
++----------+--------+------------------------------------------+
+| Centos 8 |    3.7 | c8-py37, py37                            |
++----------+--------+------------------------------------------+
+| Centos 7 |   3.10 | c7-py310                                 |
++----------+--------+------------------------------------------+
+| Centos 7 |    3.9 | c7-py39, c7-py3, c7                      |
++----------+--------+------------------------------------------+
+| Centos 7 |    3.8 | c7-py38                                  |
++----------+--------+------------------------------------------+
+| Centos 7 |    3.7 | c7-py37                                  |
++----------+--------+------------------------------------------+
+| Centos 7 |    3.6 | c7-py36, py36                            |
++----------+--------+------------------------------------------+
+| Centos 7 |    2.7 | c7-py27, c7-py2, py27, py2               |
++----------+--------+------------------------------------------+
 
 .. code-block:: bash
 

diff --git a/docker/Dockerfile_centos8_py310 b/docker/Dockerfile_centos8_py310
@@ -19,7 +19,7 @@ ENV LAW_IMAGE_PYTHON ${LAW_IMAGE_PYTHON_MAJOR}.${LAW_IMAGE_PYTHON_MINOR}
 ENV LAW_CONDA_ROOT /root/conda
 ENV LAW_CONDA_VERSION 22.11.1-1
 ENV LAW_CONDA_INSTALL_FILE https://repo.anaconda.com/miniconda/Miniconda${LAW_IMAGE_PYTHON_MAJOR}-py${LAW_IMAGE_PYTHON_MAJOR}${LAW_IMAGE_PYTHON_MINOR}_${LAW_CONDA_VERSION}-Linux-x86_64.sh
-ENV LAW_SANDBOX docker::riga/law:c8-py310
+ENV LAW_SANDBOX docker::riga/law:c8-py310,docker::riga/law:py310,docker::riga/law:c8-py3,docker::riga/law:py3,docker::riga/law:c8,docker::riga/law:latest,docker::riga/law
 
 # exposed ports
 EXPOSE 8082
@@ -53,9 +53,9 @@ SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
 
 # conda packages
 RUN conda install --yes libgcc gcc which wget nano micro screen git git-lfs cmake ncurses readline && \
-    conda clean --all
+    conda clean --all --yes
 RUN conda install --yes gfal2 gfal2-util python-gfal2 && \
-    conda clean --all
+    conda clean --all --yes
 
 # python packages
 RUN pip install --no-cache-dir --upgrade pip

diff --git a/docker/Dockerfile_centos8_py37 b/docker/Dockerfile_centos8_py37
@@ -53,9 +53,9 @@ SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
 
 # conda packages
 RUN conda install --yes libgcc gcc which wget nano micro screen git git-lfs cmake ncurses readline && \
-    conda clean --all
+    conda clean --all --yes
 RUN conda install --yes gfal2 gfal2-util python-gfal2 && \
-    conda clean --all
+    conda clean --all --yes
 
 # python packages
 RUN pip install --no-cache-dir --upgrade pip

diff --git a/docker/Dockerfile_centos8_py38 b/docker/Dockerfile_centos8_py38
@@ -53,9 +53,9 @@ SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
 
 # conda packages
 RUN conda install --yes libgcc gcc which wget nano micro screen git git-lfs cmake ncurses readline && \
-    conda clean --all
+    conda clean --all --yes
 RUN conda install --yes gfal2 gfal2-util python-gfal2 && \
-    conda clean --all
+    conda clean --all --yes
 
 # python packages
 RUN pip install --no-cache-dir --upgrade pip

diff --git a/docker/Dockerfile_centos8_py39 b/docker/Dockerfile_centos8_py39
@@ -19,7 +19,7 @@ ENV LAW_IMAGE_PYTHON ${LAW_IMAGE_PYTHON_MAJOR}.${LAW_IMAGE_PYTHON_MINOR}
 ENV LAW_CONDA_ROOT /root/conda
 ENV LAW_CONDA_VERSION 4.12.0
 ENV LAW_CONDA_INSTALL_FILE https://repo.anaconda.com/miniconda/Miniconda${LAW_IMAGE_PYTHON_MAJOR}-py${LAW_IMAGE_PYTHON_MAJOR}${LAW_IMAGE_PYTHON_MINOR}_${LAW_CONDA_VERSION}-Linux-x86_64.sh
-ENV LAW_SANDBOX docker::riga/law:c8-py39,docker::riga/law:py39,docker::riga/law:c8-py3,docker::riga/law:py3,docker::riga/law:c8,docker::riga/law:latest,docker::riga/law
+ENV LAW_SANDBOX docker::riga/law:c8-py39,docker::riga/law:py39
 
 # exposed ports
 EXPOSE 8082
@@ -53,9 +53,9 @@ SHELL ["conda", "run", "-n", "base", "/bin/bash", "-c"]
 
 # conda packages
 RUN conda install --yes libgcc gcc which wget nano micro screen git git-lfs cmake ncurses readline && \
-    conda clean --all
+    conda clean --all --yes
 RUN conda install --yes gfal2 gfal2-util python-gfal2 && \
-    conda clean --all
+    conda clean --all --yes
 
 # python packages
 RUN pip install --no-cache-dir --upgrade pip