Skip to content

Commit

Permalink
docker: Update dockerhub organization (OSGeo#3001)
Browse files Browse the repository at this point in the history
* update dockerhub organization
* update docs
* Update docker/README.md
* no alpine docker build for g78 anymore

Co-authored-by: Markus Neteler <neteler@osgeo.org>
  • Loading branch information
mmacata and neteler committed Nov 7, 2023
1 parent 7044e11 commit 4a07c19
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +22,6 @@ on:
- main
- releasebranch_*
- '!releasebranch_7_*'
- releasebranch_7_8
tags: ['*.*.*']
paths-ignore: [doc/**]
release:
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/>

0 comments on commit 4a07c19

Please sign in to comment.