From 4a07c19058e4327c49eb0023936123e803e37d91 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 | 14 ++++++--------
 docker/README.md             |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 451770d6c9b..ac0cd234c6f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,9 +7,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
@@ -23,7 +22,6 @@ on:
       - main
       - releasebranch_*
       - '!releasebranch_7_*'
-      - releasebranch_7_8
     tags: ['*.*.*']
     paths-ignore: [doc/**]
   release:
@@ -32,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
@@ -66,7 +64,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
@@ -166,7 +164,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: |
diff --git a/docker/README.md b/docker/README.md
index 8a84a43f490..b5b130495bd 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,7 +2,7 @@
 
 ## GRASS GIS docker matrix
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/mundialis/grass-py3-pdal.svg)](https://grass.osgeo.org/download/software/docker-images/)
+[![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
 
@@ -22,7 +22,7 @@ To install a docker image, run (replace `<tag>` with the desired Docker tag from
 the table above):
 
 ```bash
-docker pull mundialis/grass-py3-pdal:<tag>
+docker pull osgeo/grass-gis:<tag>
 ```
 
 See also: <https://grass.osgeo.org/download/docker/>