From 02cdc8ccf138324f5d0b89caa5740ab51f42e004 Mon Sep 17 00:00:00 2001
From: Carmen Tawalika <mmacata@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:52:27 +0200
Subject: [PATCH] docker: Update dockerhub organization (#3001)

* update dockerhub organization
* update docs
* Update docker/README.md
* no alpine docker build for g78 anymore

Co-authored-by: Markus Neteler <neteler@osgeo.org>
---
 .github/workflows/docker.yml | 24 +++++++++++++-----------
 docker/README.md             | 33 ++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 410ff3af7a5..a5798e870f8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,9 +6,8 @@ name: Docker
 #
 # job docker-branch-os-matrix:
 # * creates tags latest-alpine, latest-debian and latest-ubuntu for main branch
-# * creates tags stable-alpine, stable-debian and stable-ubuntu for releasebranch_7_8
-# * if action would trigger other branches as well, they would create
-#   tags <branch_name>-alpine, <branch_name>-debian and <branch_name>-ubuntu
+# * creates tags stable-alpine, stable-debian and stable-ubuntu for releasebranch_8_2
+# * creates tags <branch_name>-alpine, <branch_name>-debian and <branch_name>-ubuntu for all triggered branches
 #
 # job docker-main-latest:
 # * creates tag latest for main branch
@@ -19,7 +18,10 @@ name: Docker
 
 on:
   push:
-    branches: [main, releasebranch_7_8]
+    branches:
+      - main
+      - releasebranch_*
+      - '!releasebranch_7_*'
     tags: ['*.*.*']
     paths-ignore: [doc/**]
   release:
@@ -28,14 +30,14 @@ on:
 env:
   # Additionally mentioned in docker-sha-release-latest
   # as use of variable fails there
-  DOCKERHUB_REPOSITORY: mundialis/grass-py3-pdal
+  DOCKERHUB_REPOSITORY: osgeo/grass-gis
 
 jobs:
 
   # Only run for push to configured branches, do not run for releases.
   # Take care of different os. For main branch, created tags are:
   # latest-alpine, latest-debian, latest-ubuntu
-  # For releasebranch_7_8, created tags are:
+  # For releasebranch_8_2, created tags are:
   # stable-alpine, stable-debian, stable-ubuntu
   docker-branch-os-matrix:
     name: build and push ${{ matrix.os }} for branch
@@ -61,7 +63,7 @@ jobs:
           if [ "$GITHUB_REF" == "refs/heads/main" ]
           then
             TAG_PREFIX=latest
-          elif [ "$GITHUB_REF" == "refs/heads/releasebranch_7_8" ]
+          elif [ "$GITHUB_REF" == "refs/heads/releasebranch_8_2" ]
           then
             TAG_PREFIX=stable
           else
@@ -69,7 +71,7 @@ jobs:
             TAG_PREFIX=`echo $GITHUB_REF|cut -d '/' -f3`
           fi
           tag="${DOCKERHUB_REPOSITORY}:${TAG_PREFIX}-${{ matrix.os }}"
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: |
           echo ${{ steps.meta.outputs.tags }}
@@ -113,7 +115,7 @@ jobs:
         name: Create tag name
         run: |
           tag=${DOCKERHUB_REPOSITORY}:latest
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: echo ${{ steps.meta.outputs.tags }}
       - name: Set up QEMU
@@ -161,7 +163,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           # images: ${DOCKERHUB_REPOSITORY}
-          images: mundialis/grass-py3-pdal
+          images: osgeo/grass-gis
           tags: |
             type=ref,event=tag
           flavor: |
@@ -170,7 +172,7 @@ jobs:
         name: Update tag name
         run: |
           tag="${{ steps.meta.outputs.tags }}-${{ matrix.os }}"
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: |
           echo ${{ steps.meta2.outputs.tags }}
diff --git a/docker/README.md b/docker/README.md
index 84820f1c13d..2704f0e4b9a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,26 +1,29 @@
-[![Docker Pulls](https://img.shields.io/docker/pulls/mundialis/grass-py3-pdal.svg)](https://grass.osgeo.org/download/software/docker-images/)
+# GRASS GIS docker
 
-# GRASS GIS 7 docker matrix
+## GRASS GIS docker matrix
 
-| Base image   | Docker tag      | GRASS GIS  | PROJ  | GDAL  | PDAL  | Python | Image size |
-|--------------|-----------------|------------|-------|-------|-------|--------|------------|
-| Ubuntu 20.04 | latest-ubuntu   | 7.8.x      | 6.3.1 | 3.0.4 | 2.2.0 | 3.8.10 | 1.20 GB    |
-| Debian 10.1  | latest-debian   | 7.8.x      | 5.2.0 | 2.4.0 | 1.8.0 | 3.7.3  | 1.16 GB    |
-| Alpine 3.12  | latest-alpine   | 7.8.x      | 7.0.1 | 3.1.4 | 2.1.0 | 3.8.10 |  185 MB    |
+[![Docker Pulls](https://img.shields.io/docker/pulls/osgeo/grass-gis.svg)](https://grass.osgeo.org/download/docker/)
 
+Find out included version of GDAL, GEOS, PROJ, PDAL, Python and GRASS GIS using
 
-Last update: 16 Mar 2022 (source: https://github.com/OSGeo/grass/actions/workflows/docker.yml and https://hub.docker.com/r/mundialis/grass-py3-pdal/tags)
+```bash
+grass78 --tmp-location XY --exec g.version -rge \
+    && pdal --version \
+    && python3 --version
 
-# Requirements
+```
 
- * docker or podman
+## Requirements
 
-# Installation
+* docker or podman
 
-To install a docker image, run (replace `<tag>` with the desired Docker tag from the table above):
+## Installation
 
-```
-docker pull mundialis/grass-py3-pdal:<tag>
+To install a docker image, run (replace `<tag>` with the desired Docker tag from
+the table above):
+
+```bash
+docker pull osgeo/grass-gis:<tag>
 ```
 
-See also: https://grass.osgeo.org/download/docker/
+See also: <https://grass.osgeo.org/download/docker/>