Update tags and from fields (#91)

* Add latest tag to minimal Dockerfile and workflow --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/Robinlovelace/docker?shareId=XXXX-XXXX-XXXX-XXXX). * Update tags and FROM fields in workflow files and Dockerfiles --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/Robinlovelace/docker?shareId=XXXX-XXXX-XXXX-XXXX). * Update Dockerfile
geocompx · Oct 7, 2024 · fd6f487 · fd6f487
1 parent 4ea3ed8
commit fd6f487
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 62 deletions.
diff --git a/.github/workflows/binder.yml b/.github/workflows/binder.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/binder
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=binder
-            type=sha,prefix=binder_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=binder_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/buildbook.yml b/.github/workflows/buildbook.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/buildbook
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=buildbook
-            type=sha,prefix=buildbook_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=buildbook_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/geocompy.yml b/.github/workflows/geocompy.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/geocompy
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=geocompy
-            type=sha,prefix=geocompy_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=geocompy_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/latest
           # generate Docker tags based on the following events/attributes
           tags: |
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
             type=raw,value=latest
-            type=sha,prefix=latest_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=latest_
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/mamba-py.yml b/.github/workflows/mamba-py.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/mamba-py
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=mamba-py
-            type=sha,prefix=mamba_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=mamba_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/mamba-pyr.yml b/.github/workflows/mamba-pyr.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/mamba-pyr
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=mamba-pyr
-            type=sha,prefix=mamba_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=mamba_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml
@@ -28,8 +28,8 @@ jobs:
             ghcr.io/geocompx/minimal
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=sha
-            type=schedule,pattern={{date 'YYYY-MM-DD'}}
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
             type=raw,value=latest
       -
         name: Set up QEMU

diff --git a/.github/workflows/osgeo.yml b/.github/workflows/osgeo.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/osgeo
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=osgeo
-            type=sha,prefix=osgeo_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=osgeo_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/pixi-py.yml b/.github/workflows/pixi-py.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/pixi-py
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=pixi-py
-            type=sha,prefix=pixi-py_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=pixi-py_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -58,7 +58,3 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-
-
-
diff --git a/.github/workflows/pixi-r.yml b/.github/workflows/pixi-r.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/pixi-r
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=pixi-r
-            type=sha,prefix=pixi-r_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=pixi-r_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/pixi-rpy.yml b/.github/workflows/pixi-rpy.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/pixi-rpy
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=pixi-rpy
-            type=sha,prefix=pixi-rpy_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=pixi-rpy_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/python
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=python
-            type=sha,prefix=python_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=python_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/qgis
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=qgis
-            type=sha,prefix=qgis_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=qgis_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/quarto.yml b/.github/workflows/quarto.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/quarto
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=quarto
-            type=sha,prefix=quarto_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=quarto_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/rocker-rpy.yml b/.github/workflows/rocker-rpy.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/rocker-rpy
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=rocker-rpy
-            type=sha,prefix=rocker-rpy_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=rocker-rpy_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/rocker-rpyjl.yml b/.github/workflows/rocker-rpyjl.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/rocker-rpyjl
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=rocker-rpyjl
-            type=sha,prefix=rocker-rpyjl_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=rocker-rpyjl_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,9 +30,9 @@ jobs:
             ghcr.io/geocompx/rust
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=rust
-            type=sha,prefix=rust_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=rust_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/suggests.yml b/.github/workflows/suggests.yml
@@ -30,9 +30,9 @@ jobs:
             ghcr.io/geocompx/suggests
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=suggests
-            type=sha,prefix=suggests_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=suggests_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/.github/workflows/unzipped.yml b/.github/workflows/unzipped.yml
@@ -28,9 +28,9 @@ jobs:
             ghcr.io/geocompx/unzipped
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=unzipped
-            type=sha,prefix=unzipped_
-            type=schedule,pattern={{date 'YYYY-MM-DD'}},prefix=unzipped_
+            type=sha,
+            type=raw,pattern={{date 'YYYY-MM-DD'}},prefix=date_
+            type=raw,value=latest
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geocompr/geocompr:minimal
+FROM ghcr.io/geocompx/minimal
 RUN su rstudio && \
   cd /home/rstudio && \
   wget https://github.com/geocompx/geocompr/archive/main.zip && \

diff --git a/buildbook/Dockerfile b/buildbook/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/geocompx/docker:suggests
+FROM ghcr.io/geocompx/suggests
 RUN su rstudio && \
     cd /home/rstudio && \
     wget https://github.com/geocompx/geocompr/archive/main.zip && \

diff --git a/suggests/Dockerfile b/suggests/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/geocompx/docker:minimal
+FROM ghcr.io/geocompx/minimal
 # RUN --mount=type=secret,id=GITHUB_PAT \
 #   echo "GITHUB_PAT=$(cat /run/secrets/GITHUB_PAT)" > ~/.Renviron
 # RUN R -e "remotes::install_github('geocompr/geocompkg', upgrade = TRUE, dependencies = TRUE, force = TRUE)"