From fd6f4873d0f54beff067258a69e83e60ae1c1134 Mon Sep 17 00:00:00 2001 From: Robin Lovelace Date: Mon, 7 Oct 2024 10:18:38 +0100 Subject: [PATCH] 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 --- .github/workflows/binder.yml | 6 +++--- .github/workflows/buildbook.yml | 6 +++--- .github/workflows/geocompy.yml | 6 +++--- .github/workflows/latest.yml | 4 ++-- .github/workflows/mamba-py.yml | 6 +++--- .github/workflows/mamba-pyr.yml | 6 +++--- .github/workflows/minimal.yml | 4 ++-- .github/workflows/osgeo.yml | 6 +++--- .github/workflows/pixi-py.yml | 10 +++------- .github/workflows/pixi-r.yml | 6 +++--- .github/workflows/pixi-rpy.yml | 6 +++--- .github/workflows/python.yml | 6 +++--- .github/workflows/qgis.yml | 6 +++--- .github/workflows/quarto.yml | 6 +++--- .github/workflows/rocker-rpy.yml | 6 +++--- .github/workflows/rocker-rpyjl.yml | 6 +++--- .github/workflows/rust.yml | 6 +++--- .github/workflows/suggests.yml | 6 +++--- .github/workflows/unzipped.yml | 6 +++--- Dockerfile | 2 +- buildbook/Dockerfile | 2 +- suggests/Dockerfile | 2 +- 22 files changed, 58 insertions(+), 62 deletions(-) diff --git a/.github/workflows/binder.yml b/.github/workflows/binder.yml index 140e8b7..6b4ef9b 100644 --- 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 index a2eaf29..ca364a8 100644 --- 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 index 2a552ea..de6b7f0 100644 --- 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 index 77a93b2..76482ff 100644 --- 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 index 7f560af..e51044c 100644 --- 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 index a2f0d88..c290d91 100644 --- 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 index e0950ac..f6a8c0e 100644 --- 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 index 1079dff..ce0ae85 100644 --- 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 index 8320a8a..54566cc 100644 --- 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 index bae9e12..42f2268 100644 --- 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 index 14d0808..0981a16 100644 --- 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 index e874f67..7dae771 100644 --- 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 index f81be99..8ab11e9 100644 --- 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 index ed0783b..fcf6c79 100644 --- 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 index 76b78cf..be39d43 100644 --- 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 index 1851c0f..fde8365 100644 --- 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 index 65e64ca..ec69b31 100644 --- 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 index 7f6f4b3..7728e67 100644 --- 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 index 32c451a..fdc3fd1 100644 --- 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 index 45c1133..988b566 100644 --- 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 index 60bb0ca..88e2087 100644 --- 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 index 844bb93..477405f 100644 --- 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)"