From 24932fcea859290052594dc9abaf52be0e9f9f5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:22:19 +0900 Subject: [PATCH 1/9] Bump docker/setup-buildx-action from 2 to 3 (#697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
Release notes

Sourced from docker/setup-buildx-action's releases.

v3.0.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.10.0...v3.0.0

v2.10.0

What's Changed

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.9.1...v2.10.0

v2.9.1

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.9.0...v2.9.1

v2.9.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.8.0...v2.9.0

v2.8.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.7.0...v2.8.0

v2.7.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.6.0...v2.7.0

v2.6.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.5.0...v2.6.0

v2.5.0

Full Changelog: https://github.com/docker/setup-buildx-action/compare/v2.4.1...v2.5.0

v2.4.1

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=docker/setup-buildx-action&package-manager=github_actions&previous-version=2&new-version=3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/core.yml | 2 +- .github/workflows/devel.yml | 4 ++-- .github/workflows/extra.yml | 2 +- .github/workflows/r-build-test.yml | 4 ++-- .github/workflows/scripts-test.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index c13bd8e3..f1457e9b 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -63,7 +63,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push Docker images run: | BAKE_JSON=bakefiles/${{ matrix.r_version }}.docker-bake.json \ diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml index 18209bdf..2b4a9b04 100644 --- a/.github/workflows/devel.yml +++ b/.github/workflows/devel.yml @@ -24,9 +24,9 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push Docker images run: | BAKE_JSON=bakefiles/${{ matrix.bakefile }} BAKE_OPTION=--push\ --no-cache make bake-json-group diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 270ca342..3efebdc0 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -43,7 +43,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push Docker images run: | BAKE_JSON=bakefiles/extra.docker-bake.json \ diff --git a/.github/workflows/r-build-test.yml b/.github/workflows/r-build-test.yml index 0c84ce1b..71aa72b9 100644 --- a/.github/workflows/r-build-test.yml +++ b/.github/workflows/r-build-test.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v3 - name: test build @@ -72,7 +72,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v3 - name: test build diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml index eab63967..2cd6f368 100644 --- a/.github/workflows/scripts-test.yml +++ b/.github/workflows/scripts-test.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Prepare build id: prep run: | From 89e6a05aea997f8d4f29e17c65b549bae718da0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:32:07 +0900 Subject: [PATCH 2/9] Bump docker/login-action from 2 to 3 (#699) --- .github/workflows/core.yml | 4 ++-- .github/workflows/devel.yml | 2 +- .github/workflows/extra.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index f1457e9b..2abf376a 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -50,12 +50,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml index 2b4a9b04..5cac2e16 100644 --- a/.github/workflows/devel.yml +++ b/.github/workflows/devel.yml @@ -17,7 +17,7 @@ jobs: bakefile: [devel.docker-bake.json, core-latest-daily.docker-bake.json] steps: - uses: actions/checkout@v4 - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 3efebdc0..43a3c3d5 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -31,12 +31,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} From 8e0cfdc7aa09900c073108df85f7a243de50ee56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:32:42 +0900 Subject: [PATCH 3/9] Bump docker/setup-qemu-action from 2 to 3 (#698) --- .github/workflows/core.yml | 2 +- .github/workflows/devel.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 2abf376a..1952e50b 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -61,7 +61,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build and push Docker images diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml index 5cac2e16..4ef51312 100644 --- a/.github/workflows/devel.yml +++ b/.github/workflows/devel.yml @@ -22,7 +22,7 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Set up Docker Buildx From e5e55b40170896d43a0c7d2e40f252a41749a4e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:33:10 +0900 Subject: [PATCH 4/9] Bump stefanzweifel/git-auto-commit-action from 4 to 5 (#711) --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 5b39ae72..0b556fa2 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -101,7 +101,7 @@ jobs: path: reports - name: Update wiki if: github.event_name != 'pull_request' - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Automated update repository: reports From 58a2d54db4f73ed2d153835a269cbe1193784204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:35:49 +0900 Subject: [PATCH 5/9] Bump peter-evans/create-pull-request from 5 to 6 (#783) --- .github/workflows/dockerfiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml index 9c8adfe6..7e668803 100644 --- a/.github/workflows/dockerfiles.yml +++ b/.github/workflows/dockerfiles.yml @@ -25,7 +25,7 @@ jobs: make setup - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: commit-message: Automatic update of container definition files author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> From 8a91d8019c3a5341b1a535e7eab5d7cfe6694ece Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:46:29 +0900 Subject: [PATCH 6/9] Bump github/super-linter from 5 to 6 (#786) --- .github/workflows/linting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 198cf222..a381827c 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -21,7 +21,7 @@ jobs: fetch-depth: 0 - name: Lint Code Base - uses: github/super-linter@v5 + uses: github/super-linter@v6 env: VALIDATE_ALL_CODEBASE: false DEFAULT_BRANCH: master From 77cc59051da5e2fd9246ecce43d6f5b72c67bad7 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:47:17 +0900 Subject: [PATCH 7/9] ci: pin the actions/checkout version to avoid libgit2's incompatibility (#787) See actions/checkout#1692 --- .github/workflows/bakefile-test.yml | 2 +- .github/workflows/core.yml | 4 ++-- .github/workflows/devel.yml | 2 +- .github/workflows/dockerfiles.yml | 2 +- .github/workflows/extra.yml | 4 ++-- .github/workflows/linting.yml | 2 +- .github/workflows/r-build-test.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/reports.yml | 8 ++++---- .github/workflows/scripts-test.yml | 4 ++-- .github/workflows/test-experimental.yml | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/bakefile-test.yml b/.github/workflows/bakefile-test.yml index dada3a9b..a97bfb15 100644 --- a/.github/workflows/bakefile-test.yml +++ b/.github/workflows/bakefile-test.yml @@ -17,6 +17,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Run make test run: make test diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 1952e50b..eeab3484 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -26,7 +26,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - id: set-json run: | JSON=build/matrix/latest.json @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Login to Docker Hub uses: docker/login-action@v3 with: diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml index 4ef51312..cee5d2af 100644 --- a/.github/workflows/devel.yml +++ b/.github/workflows/devel.yml @@ -16,7 +16,7 @@ jobs: matrix: bakefile: [devel.docker-bake.json, core-latest-daily.docker-bake.json] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml index 7e668803..ad6dd03a 100644 --- a/.github/workflows/dockerfiles.yml +++ b/.github/workflows/dockerfiles.yml @@ -12,7 +12,7 @@ jobs: container: image: rocker/tidyverse:latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set as safe for following git commands run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: install packages diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index 43a3c3d5..60ee52b4 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -15,7 +15,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - id: set-matrix run: | CONTENT=$(jq '{ group: [.group[] | keys[] | select(. != "default")] } | tostring' -r bakefiles/extra.docker-bake.json) @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Login to Docker Hub uses: docker/login-action@v3 with: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index a381827c..d960befc 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 diff --git a/.github/workflows/r-build-test.yml b/.github/workflows/r-build-test.yml index 71aa72b9..dd70cd93 100644 --- a/.github/workflows/r-build-test.yml +++ b/.github/workflows/r-build-test.yml @@ -28,7 +28,7 @@ jobs: platforms: - linux/amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Expose GitHub Runtime @@ -70,7 +70,7 @@ jobs: - install_shiny_server.sh - install_geospatial.sh steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Expose GitHub Runtime diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 876966f1..b48e59f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: outputs: tag: ${{ steps.tag-version.outputs.new_tag }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - id: set-version run: | @@ -34,7 +34,7 @@ jobs: needs: create_tag runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Create Release uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 0b556fa2..0f2dea18 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -31,7 +31,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - id: set-matrix run: | CONTENT=$(jq -r '.r_version += ["extra"] | tostring' build/matrix/all.json) @@ -45,7 +45,7 @@ jobs: fail-fast: false matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Clean up run: | docker image prune --all --force @@ -72,12 +72,12 @@ jobs: image: rocker/tidyverse:latest steps: - name: Checkout main - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 - name: Set as safe for following git commands run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout wiki if: github.event_name != 'pull_request' - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 with: repository: "${{ github.repository }}.wiki" path: reports diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml index 2cd6f368..6d5402f7 100644 --- a/.github/workflows/scripts-test.yml +++ b/.github/workflows/scripts-test.yml @@ -23,7 +23,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - id: set-matrix run: | CONTENT=$(jq 'tostring' -r tests/rocker_scripts/matrix.json) @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: ${{fromJson(needs.generate_matrix.outputs.matrix)}} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Prepare build diff --git a/.github/workflows/test-experimental.yml b/.github/workflows/test-experimental.yml index 287f45f6..92026018 100644 --- a/.github/workflows/test-experimental.yml +++ b/.github/workflows/test-experimental.yml @@ -17,7 +17,7 @@ jobs: image: rocker/r-ver steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: build From 3a856a43aa42995176ae201124cc4ba9fe1fce85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 20:49:05 +0900 Subject: [PATCH 8/9] Automatic update of container definition files (#788) - Auto-generated by [create-pull-request][1] [1]: https://github.com/peter-evans/create-pull-request Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- bakefiles/4.3.3.docker-bake.json | 66 +--- bakefiles/4.4.0.docker-bake.json | 352 ++++++++++++++++++ bakefiles/extra.docker-bake.json | 16 +- build/matrix/all.json | 18 +- build/matrix/latest.json | 4 +- dockerfiles/binder_4.4.0.Dockerfile | 20 + dockerfiles/cuda_4.3.3.Dockerfile | 2 +- dockerfiles/cuda_4.4.0.Dockerfile | 29 ++ ... => geospatial-dev-osgeo_4.4.0.Dockerfile} | 2 +- ... => geospatial-ubuntugis_4.4.0.Dockerfile} | 2 +- dockerfiles/geospatial_4.4.0.Dockerfile | 8 + dockerfiles/ml-verse_4.3.3.Dockerfile | 2 +- dockerfiles/ml-verse_4.4.0.Dockerfile | 11 + dockerfiles/ml_4.4.0.Dockerfile | 21 ++ dockerfiles/r-ver_4.3.3.Dockerfile | 2 +- dockerfiles/r-ver_4.4.0.Dockerfile | 23 ++ dockerfiles/rstudio_4.4.0.Dockerfile | 20 + dockerfiles/shiny-verse_4.4.0.Dockerfile | 8 + dockerfiles/shiny_4.4.0.Dockerfile | 16 + dockerfiles/tidyverse_4.4.0.Dockerfile | 8 + dockerfiles/verse_4.3.3.Dockerfile | 2 +- dockerfiles/verse_4.4.0.Dockerfile | 11 + stacks/4.3.3.json | 74 +--- stacks/4.4.0.json | 342 +++++++++++++++++ stacks/extra.json | 10 +- 25 files changed, 921 insertions(+), 148 deletions(-) create mode 100644 bakefiles/4.4.0.docker-bake.json create mode 100644 dockerfiles/binder_4.4.0.Dockerfile create mode 100644 dockerfiles/cuda_4.4.0.Dockerfile rename dockerfiles/{geospatial-dev-osgeo_4.3.3.Dockerfile => geospatial-dev-osgeo_4.4.0.Dockerfile} (95%) rename dockerfiles/{geospatial-ubuntugis_4.3.3.Dockerfile => geospatial-ubuntugis_4.4.0.Dockerfile} (95%) create mode 100644 dockerfiles/geospatial_4.4.0.Dockerfile create mode 100644 dockerfiles/ml-verse_4.4.0.Dockerfile create mode 100644 dockerfiles/ml_4.4.0.Dockerfile create mode 100644 dockerfiles/r-ver_4.4.0.Dockerfile create mode 100644 dockerfiles/rstudio_4.4.0.Dockerfile create mode 100644 dockerfiles/shiny-verse_4.4.0.Dockerfile create mode 100644 dockerfiles/shiny_4.4.0.Dockerfile create mode 100644 dockerfiles/tidyverse_4.4.0.Dockerfile create mode 100644 dockerfiles/verse_4.4.0.Dockerfile create mode 100644 stacks/4.4.0.json diff --git a/bakefiles/4.3.3.docker-bake.json b/bakefiles/4.3.3.docker-bake.json index 412692b3..69a27e94 100644 --- a/bakefiles/4.3.3.docker-bake.json +++ b/bakefiles/4.3.3.docker-bake.json @@ -40,11 +40,7 @@ "docker.io/rocker/r-ver:4.3.3", "ghcr.io/rocker-org/r-ver:4.3.3", "docker.io/rocker/r-ver:4.3", - "ghcr.io/rocker-org/r-ver:4.3", - "docker.io/rocker/r-ver:4", - "ghcr.io/rocker-org/r-ver:4", - "docker.io/rocker/r-ver:latest", - "ghcr.io/rocker-org/r-ver:latest" + "ghcr.io/rocker-org/r-ver:4.3" ], "platforms": [ "linux/amd64", @@ -70,11 +66,7 @@ "docker.io/rocker/rstudio:4.3.3", "ghcr.io/rocker-org/rstudio:4.3.3", "docker.io/rocker/rstudio:4.3", - "ghcr.io/rocker-org/rstudio:4.3", - "docker.io/rocker/rstudio:4", - "ghcr.io/rocker-org/rstudio:4", - "docker.io/rocker/rstudio:latest", - "ghcr.io/rocker-org/rstudio:latest" + "ghcr.io/rocker-org/rstudio:4.3" ], "platforms": [ "linux/amd64", @@ -100,11 +92,7 @@ "docker.io/rocker/tidyverse:4.3.3", "ghcr.io/rocker-org/tidyverse:4.3.3", "docker.io/rocker/tidyverse:4.3", - "ghcr.io/rocker-org/tidyverse:4.3", - "docker.io/rocker/tidyverse:4", - "ghcr.io/rocker-org/tidyverse:4", - "docker.io/rocker/tidyverse:latest", - "ghcr.io/rocker-org/tidyverse:latest" + "ghcr.io/rocker-org/tidyverse:4.3" ], "platforms": [ "linux/amd64" @@ -129,11 +117,7 @@ "docker.io/rocker/verse:4.3.3", "ghcr.io/rocker-org/verse:4.3.3", "docker.io/rocker/verse:4.3", - "ghcr.io/rocker-org/verse:4.3", - "docker.io/rocker/verse:4", - "ghcr.io/rocker-org/verse:4", - "docker.io/rocker/verse:latest", - "ghcr.io/rocker-org/verse:latest" + "ghcr.io/rocker-org/verse:4.3" ], "platforms": [ "linux/amd64" @@ -158,11 +142,7 @@ "docker.io/rocker/geospatial:4.3.3", "ghcr.io/rocker-org/geospatial:4.3.3", "docker.io/rocker/geospatial:4.3", - "ghcr.io/rocker-org/geospatial:4.3", - "docker.io/rocker/geospatial:4", - "ghcr.io/rocker-org/geospatial:4", - "docker.io/rocker/geospatial:latest", - "ghcr.io/rocker-org/geospatial:latest" + "ghcr.io/rocker-org/geospatial:4.3" ], "platforms": [ "linux/amd64" @@ -187,11 +167,7 @@ "docker.io/rocker/shiny:4.3.3", "ghcr.io/rocker-org/shiny:4.3.3", "docker.io/rocker/shiny:4.3", - "ghcr.io/rocker-org/shiny:4.3", - "docker.io/rocker/shiny:4", - "ghcr.io/rocker-org/shiny:4", - "docker.io/rocker/shiny:latest", - "ghcr.io/rocker-org/shiny:latest" + "ghcr.io/rocker-org/shiny:4.3" ], "platforms": [ "linux/amd64" @@ -216,11 +192,7 @@ "docker.io/rocker/shiny-verse:4.3.3", "ghcr.io/rocker-org/shiny-verse:4.3.3", "docker.io/rocker/shiny-verse:4.3", - "ghcr.io/rocker-org/shiny-verse:4.3", - "docker.io/rocker/shiny-verse:4", - "ghcr.io/rocker-org/shiny-verse:4", - "docker.io/rocker/shiny-verse:latest", - "ghcr.io/rocker-org/shiny-verse:latest" + "ghcr.io/rocker-org/shiny-verse:4.3" ], "platforms": [ "linux/amd64" @@ -245,11 +217,7 @@ "docker.io/rocker/binder:4.3.3", "ghcr.io/rocker-org/binder:4.3.3", "docker.io/rocker/binder:4.3", - "ghcr.io/rocker-org/binder:4.3", - "docker.io/rocker/binder:4", - "ghcr.io/rocker-org/binder:4", - "docker.io/rocker/binder:latest", - "ghcr.io/rocker-org/binder:latest" + "ghcr.io/rocker-org/binder:4.3" ], "platforms": [ "linux/amd64" @@ -274,11 +242,7 @@ "docker.io/rocker/cuda:4.3.3", "ghcr.io/rocker-org/cuda:4.3.3", "docker.io/rocker/cuda:4.3", - "ghcr.io/rocker-org/cuda:4.3", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest" + "ghcr.io/rocker-org/cuda:4.3" ], "platforms": [ "linux/amd64" @@ -303,11 +267,7 @@ "docker.io/rocker/ml:4.3.3", "ghcr.io/rocker-org/ml:4.3.3", "docker.io/rocker/ml:4.3", - "ghcr.io/rocker-org/ml:4.3", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest" + "ghcr.io/rocker-org/ml:4.3" ], "platforms": [ "linux/amd64" @@ -332,11 +292,7 @@ "docker.io/rocker/ml-verse:4.3.3", "ghcr.io/rocker-org/ml-verse:4.3.3", "docker.io/rocker/ml-verse:4.3", - "ghcr.io/rocker-org/ml-verse:4.3", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" + "ghcr.io/rocker-org/ml-verse:4.3" ], "platforms": [ "linux/amd64" diff --git a/bakefiles/4.4.0.docker-bake.json b/bakefiles/4.4.0.docker-bake.json new file mode 100644 index 00000000..2c4c5404 --- /dev/null +++ b/bakefiles/4.4.0.docker-bake.json @@ -0,0 +1,352 @@ +{ + "group": [ + { + "default": [ + { + "targets": [ + "r-ver", + "rstudio", + "tidyverse", + "verse", + "geospatial", + "shiny", + "shiny-verse", + "binder" + ] + } + ], + "cuda11images": [ + { + "targets": [ + "cuda", + "ml", + "ml-verse" + ] + } + ] + } + ], + "target": { + "r-ver": { + "context": "./", + "dockerfile": "dockerfiles/r-ver_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/r-ver", + "org.opencontainers.image.description": "Reproducible builds to fixed version of R", + "org.opencontainers.image.base.name": "docker.io/library/ubuntu:jammy", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/r-ver:4.4.0", + "ghcr.io/rocker-org/r-ver:4.4.0", + "docker.io/rocker/r-ver:4.4", + "ghcr.io/rocker-org/r-ver:4.4", + "docker.io/rocker/r-ver:4", + "ghcr.io/rocker-org/r-ver:4", + "docker.io/rocker/r-ver:latest", + "ghcr.io/rocker-org/r-ver:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ], + "cache-from": [ + "docker.io/rocker/r-ver:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "rstudio": { + "context": "./", + "dockerfile": "dockerfiles/rstudio_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/rstudio", + "org.opencontainers.image.description": "RStudio Server with fixed version of R", + "org.opencontainers.image.base.name": "docker.io/rocker/r-ver:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/rstudio:4.4.0", + "ghcr.io/rocker-org/rstudio:4.4.0", + "docker.io/rocker/rstudio:4.4", + "ghcr.io/rocker-org/rstudio:4.4", + "docker.io/rocker/rstudio:4", + "ghcr.io/rocker-org/rstudio:4", + "docker.io/rocker/rstudio:latest", + "ghcr.io/rocker-org/rstudio:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ], + "cache-from": [ + "docker.io/rocker/rstudio:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "tidyverse": { + "context": "./", + "dockerfile": "dockerfiles/tidyverse_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/tidyverse", + "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages.", + "org.opencontainers.image.base.name": "docker.io/rocker/rstudio:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/tidyverse:4.4.0", + "ghcr.io/rocker-org/tidyverse:4.4.0", + "docker.io/rocker/tidyverse:4.4", + "ghcr.io/rocker-org/tidyverse:4.4", + "docker.io/rocker/tidyverse:4", + "ghcr.io/rocker-org/tidyverse:4", + "docker.io/rocker/tidyverse:latest", + "ghcr.io/rocker-org/tidyverse:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/tidyverse:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "verse": { + "context": "./", + "dockerfile": "dockerfiles/verse_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/verse", + "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image.", + "org.opencontainers.image.base.name": "docker.io/rocker/tidyverse:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/verse:4.4.0", + "ghcr.io/rocker-org/verse:4.4.0", + "docker.io/rocker/verse:4.4", + "ghcr.io/rocker-org/verse:4.4", + "docker.io/rocker/verse:4", + "ghcr.io/rocker-org/verse:4", + "docker.io/rocker/verse:latest", + "ghcr.io/rocker-org/verse:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/verse:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "geospatial": { + "context": "./", + "dockerfile": "dockerfiles/geospatial_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/geospatial", + "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", + "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/geospatial:4.4.0", + "ghcr.io/rocker-org/geospatial:4.4.0", + "docker.io/rocker/geospatial:4.4", + "ghcr.io/rocker-org/geospatial:4.4", + "docker.io/rocker/geospatial:4", + "ghcr.io/rocker-org/geospatial:4", + "docker.io/rocker/geospatial:latest", + "ghcr.io/rocker-org/geospatial:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/geospatial:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "shiny": { + "context": "./", + "dockerfile": "dockerfiles/shiny_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/shiny", + "org.opencontainers.image.description": "Shiny Server on versioned Rocker image.", + "org.opencontainers.image.base.name": "docker.io/rocker/r-ver:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/shiny:4.4.0", + "ghcr.io/rocker-org/shiny:4.4.0", + "docker.io/rocker/shiny:4.4", + "ghcr.io/rocker-org/shiny:4.4", + "docker.io/rocker/shiny:4", + "ghcr.io/rocker-org/shiny:4", + "docker.io/rocker/shiny:latest", + "ghcr.io/rocker-org/shiny:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/shiny:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "shiny-verse": { + "context": "./", + "dockerfile": "dockerfiles/shiny-verse_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/shiny-verse", + "org.opencontainers.image.description": "Rocker Shiny image + Tidyverse R packages. Uses version-stable image.", + "org.opencontainers.image.base.name": "docker.io/rocker/shiny:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/shiny-verse:4.4.0", + "ghcr.io/rocker-org/shiny-verse:4.4.0", + "docker.io/rocker/shiny-verse:4.4", + "ghcr.io/rocker-org/shiny-verse:4.4", + "docker.io/rocker/shiny-verse:4", + "ghcr.io/rocker-org/shiny-verse:4", + "docker.io/rocker/shiny-verse:latest", + "ghcr.io/rocker-org/shiny-verse:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/shiny-verse:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "binder": { + "context": "./", + "dockerfile": "dockerfiles/binder_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/binder", + "org.opencontainers.image.description": "Adds Jupyter to rocker/geospatial. RStudio Server can be started from Jupyter.", + "org.opencontainers.image.base.name": "docker.io/rocker/geospatial:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/binder:4.4.0", + "ghcr.io/rocker-org/binder:4.4.0", + "docker.io/rocker/binder:4.4", + "ghcr.io/rocker-org/binder:4.4", + "docker.io/rocker/binder:4", + "ghcr.io/rocker-org/binder:4", + "docker.io/rocker/binder:latest", + "ghcr.io/rocker-org/binder:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/binder:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "cuda": { + "context": "./", + "dockerfile": "dockerfiles/cuda_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/cuda", + "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image.", + "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/cuda:4.4.0", + "ghcr.io/rocker-org/cuda:4.4.0", + "docker.io/rocker/cuda:4.4", + "ghcr.io/rocker-org/cuda:4.4", + "docker.io/rocker/cuda:4", + "ghcr.io/rocker-org/cuda:4", + "docker.io/rocker/cuda:latest", + "ghcr.io/rocker-org/cuda:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/cuda:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "ml": { + "context": "./", + "dockerfile": "dockerfiles/ml_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/ml", + "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries.", + "org.opencontainers.image.base.name": "docker.io/rocker/cuda:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/ml:4.4.0", + "ghcr.io/rocker-org/ml:4.4.0", + "docker.io/rocker/ml:4.4", + "ghcr.io/rocker-org/ml:4.4", + "docker.io/rocker/ml:4", + "ghcr.io/rocker-org/ml:4", + "docker.io/rocker/ml:latest", + "ghcr.io/rocker-org/ml:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/ml:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + "ml-verse": { + "context": "./", + "dockerfile": "dockerfiles/ml-verse_4.4.0.Dockerfile", + "labels": { + "org.opencontainers.image.title": "rocker/ml-verse", + "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages.", + "org.opencontainers.image.base.name": "docker.io/rocker/ml:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" + }, + "tags": [ + "docker.io/rocker/ml-verse:4.4.0", + "ghcr.io/rocker-org/ml-verse:4.4.0", + "docker.io/rocker/ml-verse:4.4", + "ghcr.io/rocker-org/ml-verse:4.4", + "docker.io/rocker/ml-verse:4", + "ghcr.io/rocker-org/ml-verse:4", + "docker.io/rocker/ml-verse:latest", + "ghcr.io/rocker-org/ml-verse:latest" + ], + "platforms": [ + "linux/amd64" + ], + "cache-from": [ + "docker.io/rocker/ml-verse:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + } + } +} diff --git a/bakefiles/extra.docker-bake.json b/bakefiles/extra.docker-bake.json index bafb4567..71afa156 100644 --- a/bakefiles/extra.docker-bake.json +++ b/bakefiles/extra.docker-bake.json @@ -28,16 +28,16 @@ "target": { "geospatial-ubuntugis": { "context": "./", - "dockerfile": "dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile", + "dockerfile": "dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/geospatial on ubuntugis", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.3.3", - "org.opencontainers.image.version": "R-4.3.3" + "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" }, "tags": [ - "docker.io/rocker/geospatial:4.3.3-ubuntugis", - "ghcr.io/rocker-org/geospatial:4.3.3-ubuntugis", + "docker.io/rocker/geospatial:4.4.0-ubuntugis", + "ghcr.io/rocker-org/geospatial:4.4.0-ubuntugis", "docker.io/rocker/geospatial:ubuntugis", "ghcr.io/rocker-org/geospatial:ubuntugis" ], @@ -53,12 +53,12 @@ }, "geospatial-dev-osgeo": { "context": "./", - "dockerfile": "dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile", + "dockerfile": "dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/geospatial on dev-osgeo", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.3.3", - "org.opencontainers.image.version": "R-4.3.3" + "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", + "org.opencontainers.image.version": "R-4.4.0" }, "tags": [ "docker.io/rocker/geospatial:dev-osgeo", diff --git a/build/matrix/all.json b/build/matrix/all.json index 734766cf..8d8aa31a 100644 --- a/build/matrix/all.json +++ b/build/matrix/all.json @@ -1,23 +1,11 @@ { - "r_version": ["4.0.5", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1", "4.3.2", "4.3.3"], + "r_version": ["4.0.5", "4.1.3", "4.2.3", "4.3.0", "4.3.1", "4.3.2", "4.3.3", "4.4.0"], "group": ["default"], "include": [ { "r_version": "4.1.3", "group": "cuda11images" }, - { - "r_version": "4.2.0", - "group": "cuda11images" - }, - { - "r_version": "4.2.1", - "group": "cuda11images" - }, - { - "r_version": "4.2.2", - "group": "cuda11images" - }, { "r_version": "4.2.3", "group": "cuda11images" @@ -37,6 +25,10 @@ { "r_version": "4.3.3", "group": "cuda11images" + }, + { + "r_version": "4.4.0", + "group": "cuda11images" } ] } diff --git a/build/matrix/latest.json b/build/matrix/latest.json index 192092e6..78236b44 100644 --- a/build/matrix/latest.json +++ b/build/matrix/latest.json @@ -1,9 +1,9 @@ { - "r_version": ["4.3.3"], + "r_version": ["4.4.0"], "group": ["default"], "include": [ { - "r_version": "4.3.3", + "r_version": "4.4.0", "group": "cuda11images" } ] diff --git a/dockerfiles/binder_4.4.0.Dockerfile b/dockerfiles/binder_4.4.0.Dockerfile new file mode 100644 index 00000000..09a4b04f --- /dev/null +++ b/dockerfiles/binder_4.4.0.Dockerfile @@ -0,0 +1,20 @@ +FROM rocker/geospatial:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV NB_USER=rstudio +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH} + +RUN /rocker_scripts/install_jupyter.sh + +EXPOSE 8888 + +CMD ["jupyter", "lab", "--ip", "0.0.0.0", "--no-browser"] + +USER ${NB_USER} + +WORKDIR /home/${NB_USER} diff --git a/dockerfiles/cuda_4.3.3.Dockerfile b/dockerfiles/cuda_4.3.3.Dockerfile index 54ce9f9d..5f9b6168 100644 --- a/dockerfiles/cuda_4.3.3.Dockerfile +++ b/dockerfiles/cuda_4.3.3.Dockerfile @@ -19,7 +19,7 @@ COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh RUN /rocker_scripts/install_R_source.sh -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/2024-04-23 ENV LANG=en_US.UTF-8 COPY scripts /rocker_scripts diff --git a/dockerfiles/cuda_4.4.0.Dockerfile b/dockerfiles/cuda_4.4.0.Dockerfile new file mode 100644 index 00000000..335cbb51 --- /dev/null +++ b/dockerfiles/cuda_4.4.0.Dockerfile @@ -0,0 +1,29 @@ +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV R_VERSION=4.4.0 +ENV R_HOME=/usr/local/lib/R +ENV TZ=Etc/UTC +ENV NVBLAS_CONFIG_FILE=/etc/nvblas.conf +ENV PYTHON_CONFIGURE_OPTS=--enable-shared +ENV RETICULATE_AUTOCONFIGURE=0 +ENV PURGE_BUILDDEPS=false +ENV VIRTUAL_ENV=/opt/venv +ENV PATH=${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin + +COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh + +RUN /rocker_scripts/install_R_source.sh + +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest +ENV LANG=en_US.UTF-8 + +COPY scripts /rocker_scripts + +RUN /rocker_scripts/setup_R.sh +RUN /rocker_scripts/config_R_cuda.sh +RUN /rocker_scripts/install_python.sh diff --git a/dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile b/dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile similarity index 95% rename from dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile rename to dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile index a2719c61..851a4437 100644 --- a/dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile +++ b/dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:4.3.3 +FROM rocker/verse:4.4.0 LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ diff --git a/dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile b/dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile similarity index 95% rename from dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile rename to dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile index e4a20e43..bf38a730 100644 --- a/dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile +++ b/dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:4.3.3 +FROM rocker/verse:4.4.0 LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ diff --git a/dockerfiles/geospatial_4.4.0.Dockerfile b/dockerfiles/geospatial_4.4.0.Dockerfile new file mode 100644 index 00000000..09330fe4 --- /dev/null +++ b/dockerfiles/geospatial_4.4.0.Dockerfile @@ -0,0 +1,8 @@ +FROM rocker/verse:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml-verse_4.3.3.Dockerfile b/dockerfiles/ml-verse_4.3.3.Dockerfile index 8d627371..2305bd16 100644 --- a/dockerfiles/ml-verse_4.3.3.Dockerfile +++ b/dockerfiles/ml-verse_4.3.3.Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.vendor="Rocker Project" \ org.opencontainers.image.authors="Carl Boettiger " -ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet +ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2024/04/23/tlnet RUN /rocker_scripts/install_verse.sh RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml-verse_4.4.0.Dockerfile b/dockerfiles/ml-verse_4.4.0.Dockerfile new file mode 100644 index 00000000..53698d4b --- /dev/null +++ b/dockerfiles/ml-verse_4.4.0.Dockerfile @@ -0,0 +1,11 @@ +FROM rocker/ml:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet + +RUN /rocker_scripts/install_verse.sh +RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml_4.4.0.Dockerfile b/dockerfiles/ml_4.4.0.Dockerfile new file mode 100644 index 00000000..9beadfcf --- /dev/null +++ b/dockerfiles/ml_4.4.0.Dockerfile @@ -0,0 +1,21 @@ +FROM rocker/cuda:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV S6_VERSION=v2.1.0.2 +ENV RSTUDIO_VERSION=2023.12.0+369 +ENV DEFAULT_USER=rstudio +ENV PANDOC_VERSION=default +ENV QUARTO_VERSION=default + +RUN /rocker_scripts/install_rstudio.sh +RUN /rocker_scripts/install_pandoc.sh +RUN /rocker_scripts/install_quarto.sh +RUN /rocker_scripts/install_tidyverse.sh + +EXPOSE 8787 + +CMD ["/init"] diff --git a/dockerfiles/r-ver_4.3.3.Dockerfile b/dockerfiles/r-ver_4.3.3.Dockerfile index e810129b..129e71de 100644 --- a/dockerfiles/r-ver_4.3.3.Dockerfile +++ b/dockerfiles/r-ver_4.3.3.Dockerfile @@ -13,7 +13,7 @@ COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh RUN /rocker_scripts/install_R_source.sh -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/2024-04-23 ENV LANG=en_US.UTF-8 COPY scripts /rocker_scripts diff --git a/dockerfiles/r-ver_4.4.0.Dockerfile b/dockerfiles/r-ver_4.4.0.Dockerfile new file mode 100644 index 00000000..e02eeb68 --- /dev/null +++ b/dockerfiles/r-ver_4.4.0.Dockerfile @@ -0,0 +1,23 @@ +FROM ubuntu:jammy + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV R_VERSION=4.4.0 +ENV R_HOME=/usr/local/lib/R +ENV TZ=Etc/UTC + +COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh + +RUN /rocker_scripts/install_R_source.sh + +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest +ENV LANG=en_US.UTF-8 + +COPY scripts /rocker_scripts + +RUN /rocker_scripts/setup_R.sh + +CMD ["R"] diff --git a/dockerfiles/rstudio_4.4.0.Dockerfile b/dockerfiles/rstudio_4.4.0.Dockerfile new file mode 100644 index 00000000..1de40b5d --- /dev/null +++ b/dockerfiles/rstudio_4.4.0.Dockerfile @@ -0,0 +1,20 @@ +FROM rocker/r-ver:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV S6_VERSION=v2.1.0.2 +ENV RSTUDIO_VERSION=2023.12.0+369 +ENV DEFAULT_USER=rstudio +ENV PANDOC_VERSION=default +ENV QUARTO_VERSION=default + +RUN /rocker_scripts/install_rstudio.sh +RUN /rocker_scripts/install_pandoc.sh +RUN /rocker_scripts/install_quarto.sh + +EXPOSE 8787 + +CMD ["/init"] diff --git a/dockerfiles/shiny-verse_4.4.0.Dockerfile b/dockerfiles/shiny-verse_4.4.0.Dockerfile new file mode 100644 index 00000000..250f673c --- /dev/null +++ b/dockerfiles/shiny-verse_4.4.0.Dockerfile @@ -0,0 +1,8 @@ +FROM rocker/shiny:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +RUN /rocker_scripts/install_tidyverse.sh diff --git a/dockerfiles/shiny_4.4.0.Dockerfile b/dockerfiles/shiny_4.4.0.Dockerfile new file mode 100644 index 00000000..3ee86ede --- /dev/null +++ b/dockerfiles/shiny_4.4.0.Dockerfile @@ -0,0 +1,16 @@ +FROM rocker/r-ver:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV S6_VERSION=v2.1.0.2 +ENV SHINY_SERVER_VERSION=latest +ENV PANDOC_VERSION=default + +RUN /rocker_scripts/install_shiny_server.sh + +EXPOSE 3838 + +CMD ["/init"] diff --git a/dockerfiles/tidyverse_4.4.0.Dockerfile b/dockerfiles/tidyverse_4.4.0.Dockerfile new file mode 100644 index 00000000..c18f9caf --- /dev/null +++ b/dockerfiles/tidyverse_4.4.0.Dockerfile @@ -0,0 +1,8 @@ +FROM rocker/rstudio:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +RUN /rocker_scripts/install_tidyverse.sh diff --git a/dockerfiles/verse_4.3.3.Dockerfile b/dockerfiles/verse_4.3.3.Dockerfile index 1df3da3c..21aeb44e 100644 --- a/dockerfiles/verse_4.3.3.Dockerfile +++ b/dockerfiles/verse_4.3.3.Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.vendor="Rocker Project" \ org.opencontainers.image.authors="Carl Boettiger " -ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet +ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2024/04/23/tlnet ENV PATH=$PATH:/usr/local/texlive/bin/linux RUN /rocker_scripts/install_verse.sh diff --git a/dockerfiles/verse_4.4.0.Dockerfile b/dockerfiles/verse_4.4.0.Dockerfile new file mode 100644 index 00000000..2fd9fec3 --- /dev/null +++ b/dockerfiles/verse_4.4.0.Dockerfile @@ -0,0 +1,11 @@ +FROM rocker/tidyverse:4.4.0 + +LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ + org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ + org.opencontainers.image.vendor="Rocker Project" \ + org.opencontainers.image.authors="Carl Boettiger " + +ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet +ENV PATH=$PATH:/usr/local/texlive/bin/linux + +RUN /rocker_scripts/install_verse.sh diff --git a/stacks/4.3.3.json b/stacks/4.3.3.json index 261c3156..3787815e 100644 --- a/stacks/4.3.3.json +++ b/stacks/4.3.3.json @@ -32,7 +32,7 @@ "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", + "CRAN": "https://p3m.dev/cran/__linux__/jammy/2024-04-23", "LANG": "en_US.UTF-8" }, "COPY": "scripts /rocker_scripts", @@ -42,11 +42,7 @@ "docker.io/rocker/r-ver:4.3.3", "ghcr.io/rocker-org/r-ver:4.3.3", "docker.io/rocker/r-ver:4.3", - "ghcr.io/rocker-org/r-ver:4.3", - "docker.io/rocker/r-ver:4", - "ghcr.io/rocker-org/r-ver:4", - "docker.io/rocker/r-ver:latest", - "ghcr.io/rocker-org/r-ver:latest" + "ghcr.io/rocker-org/r-ver:4.3" ], "platforms": [ "linux/amd64", @@ -84,11 +80,7 @@ "docker.io/rocker/rstudio:4.3.3", "ghcr.io/rocker-org/rstudio:4.3.3", "docker.io/rocker/rstudio:4.3", - "ghcr.io/rocker-org/rstudio:4.3", - "docker.io/rocker/rstudio:4", - "ghcr.io/rocker-org/rstudio:4", - "docker.io/rocker/rstudio:latest", - "ghcr.io/rocker-org/rstudio:latest" + "ghcr.io/rocker-org/rstudio:4.3" ], "platforms": [ "linux/amd64", @@ -107,11 +99,7 @@ "docker.io/rocker/tidyverse:4.3.3", "ghcr.io/rocker-org/tidyverse:4.3.3", "docker.io/rocker/tidyverse:4.3", - "ghcr.io/rocker-org/tidyverse:4.3", - "docker.io/rocker/tidyverse:4", - "ghcr.io/rocker-org/tidyverse:4", - "docker.io/rocker/tidyverse:latest", - "ghcr.io/rocker-org/tidyverse:latest" + "ghcr.io/rocker-org/tidyverse:4.3" ] }, { @@ -122,7 +110,7 @@ }, "FROM": "rocker/tidyverse:4.3.3", "ENV": { - "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet", + "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2024/04/23/tlnet", "PATH": "$PATH:/usr/local/texlive/bin/linux" }, "RUN": [ @@ -132,11 +120,7 @@ "docker.io/rocker/verse:4.3.3", "ghcr.io/rocker-org/verse:4.3.3", "docker.io/rocker/verse:4.3", - "ghcr.io/rocker-org/verse:4.3", - "docker.io/rocker/verse:4", - "ghcr.io/rocker-org/verse:4", - "docker.io/rocker/verse:latest", - "ghcr.io/rocker-org/verse:latest" + "ghcr.io/rocker-org/verse:4.3" ] }, { @@ -151,11 +135,7 @@ "docker.io/rocker/geospatial:4.3.3", "ghcr.io/rocker-org/geospatial:4.3.3", "docker.io/rocker/geospatial:4.3", - "ghcr.io/rocker-org/geospatial:4.3", - "docker.io/rocker/geospatial:4", - "ghcr.io/rocker-org/geospatial:4", - "docker.io/rocker/geospatial:latest", - "ghcr.io/rocker-org/geospatial:latest" + "ghcr.io/rocker-org/geospatial:4.3" ] }, { @@ -177,11 +157,7 @@ "docker.io/rocker/shiny:4.3.3", "ghcr.io/rocker-org/shiny:4.3.3", "docker.io/rocker/shiny:4.3", - "ghcr.io/rocker-org/shiny:4.3", - "docker.io/rocker/shiny:4", - "ghcr.io/rocker-org/shiny:4", - "docker.io/rocker/shiny:latest", - "ghcr.io/rocker-org/shiny:latest" + "ghcr.io/rocker-org/shiny:4.3" ] }, { @@ -196,11 +172,7 @@ "docker.io/rocker/shiny-verse:4.3.3", "ghcr.io/rocker-org/shiny-verse:4.3.3", "docker.io/rocker/shiny-verse:4.3", - "ghcr.io/rocker-org/shiny-verse:4.3", - "docker.io/rocker/shiny-verse:4", - "ghcr.io/rocker-org/shiny-verse:4", - "docker.io/rocker/shiny-verse:latest", - "ghcr.io/rocker-org/shiny-verse:latest" + "ghcr.io/rocker-org/shiny-verse:4.3" ] }, { @@ -226,11 +198,7 @@ "docker.io/rocker/binder:4.3.3", "ghcr.io/rocker-org/binder:4.3.3", "docker.io/rocker/binder:4.3", - "ghcr.io/rocker-org/binder:4.3", - "docker.io/rocker/binder:4", - "ghcr.io/rocker-org/binder:4", - "docker.io/rocker/binder:latest", - "ghcr.io/rocker-org/binder:latest" + "ghcr.io/rocker-org/binder:4.3" ] }, { @@ -239,11 +207,7 @@ "docker.io/rocker/cuda:4.3.3", "ghcr.io/rocker-org/cuda:4.3.3", "docker.io/rocker/cuda:4.3", - "ghcr.io/rocker-org/cuda:4.3", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest" + "ghcr.io/rocker-org/cuda:4.3" ], "labels": { "org.opencontainers.image.title": "rocker/cuda", @@ -264,7 +228,7 @@ "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", + "CRAN": "https://p3m.dev/cran/__linux__/jammy/2024-04-23", "LANG": "en_US.UTF-8" }, "COPY": "scripts /rocker_scripts", @@ -286,11 +250,7 @@ "docker.io/rocker/ml:4.3.3", "ghcr.io/rocker-org/ml:4.3.3", "docker.io/rocker/ml:4.3", - "ghcr.io/rocker-org/ml:4.3", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest" + "ghcr.io/rocker-org/ml:4.3" ], "labels": { "org.opencontainers.image.title": "rocker/ml", @@ -319,11 +279,7 @@ "docker.io/rocker/ml-verse:4.3.3", "ghcr.io/rocker-org/ml-verse:4.3.3", "docker.io/rocker/ml-verse:4.3", - "ghcr.io/rocker-org/ml-verse:4.3", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" + "ghcr.io/rocker-org/ml-verse:4.3" ], "labels": { "org.opencontainers.image.title": "rocker/ml-verse", @@ -331,7 +287,7 @@ }, "FROM": "rocker/ml:4.3.3", "ENV": { - "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet" + "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2024/04/23/tlnet" }, "RUN": [ "/rocker_scripts/install_verse.sh", diff --git a/stacks/4.4.0.json b/stacks/4.4.0.json new file mode 100644 index 00000000..f001dd9b --- /dev/null +++ b/stacks/4.4.0.json @@ -0,0 +1,342 @@ +{ + "ordered": true, + "TAG": "4.4.0", + "LABEL": "org.opencontainers.image.licenses=\"GPL-2.0-or-later\" \\\n org.opencontainers.image.source=\"https://github.com/rocker-org/rocker-versioned2\" \\\n org.opencontainers.image.vendor=\"Rocker Project\" \\\n org.opencontainers.image.authors=\"Carl Boettiger \"", + "group": [ + { + "default": [ + { + "targets": ["r-ver", "rstudio", "tidyverse", "verse", "geospatial", "shiny", "shiny-verse", "binder"] + } + ], + "cuda11images": [ + { + "targets": ["cuda", "ml", "ml-verse"] + } + ] + } + ], + "stack": [ + { + "IMAGE": "r-ver", + "labels": { + "org.opencontainers.image.title": "rocker/r-ver", + "org.opencontainers.image.description": "Reproducible builds to fixed version of R" + }, + "FROM": "ubuntu:jammy", + "ENV": { + "R_VERSION": "4.4.0", + "R_HOME": "/usr/local/lib/R", + "TZ": "Etc/UTC" + }, + "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", + "RUN_a_script": "/rocker_scripts/install_R_source.sh", + "ENV_after_a_script": { + "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", + "LANG": "en_US.UTF-8" + }, + "COPY": "scripts /rocker_scripts", + "RUN": "/rocker_scripts/setup_R.sh", + "CMD": "[\"R\"]", + "tags": [ + "docker.io/rocker/r-ver:4.4.0", + "ghcr.io/rocker-org/r-ver:4.4.0", + "docker.io/rocker/r-ver:4.4", + "ghcr.io/rocker-org/r-ver:4.4", + "docker.io/rocker/r-ver:4", + "ghcr.io/rocker-org/r-ver:4", + "docker.io/rocker/r-ver:latest", + "ghcr.io/rocker-org/r-ver:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ], + "cache-from": [ + "docker.io/rocker/r-ver:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + { + "IMAGE": "rstudio", + "labels": { + "org.opencontainers.image.title": "rocker/rstudio", + "org.opencontainers.image.description": "RStudio Server with fixed version of R" + }, + "FROM": "rocker/r-ver:4.4.0", + "ENV": { + "S6_VERSION": "v2.1.0.2", + "RSTUDIO_VERSION": "2023.12.0+369", + "DEFAULT_USER": "rstudio", + "PANDOC_VERSION": "default", + "QUARTO_VERSION": "default" + }, + "RUN": [ + "/rocker_scripts/install_rstudio.sh", + "/rocker_scripts/install_pandoc.sh", + "/rocker_scripts/install_quarto.sh" + ], + "CMD": "[\"/init\"]", + "EXPOSE": 8787, + "tags": [ + "docker.io/rocker/rstudio:4.4.0", + "ghcr.io/rocker-org/rstudio:4.4.0", + "docker.io/rocker/rstudio:4.4", + "ghcr.io/rocker-org/rstudio:4.4", + "docker.io/rocker/rstudio:4", + "ghcr.io/rocker-org/rstudio:4", + "docker.io/rocker/rstudio:latest", + "ghcr.io/rocker-org/rstudio:latest" + ], + "platforms": [ + "linux/amd64", + "linux/arm64" + ] + }, + { + "IMAGE": "tidyverse", + "labels": { + "org.opencontainers.image.title": "rocker/tidyverse", + "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages." + }, + "FROM": "rocker/rstudio:4.4.0", + "RUN": "/rocker_scripts/install_tidyverse.sh", + "tags": [ + "docker.io/rocker/tidyverse:4.4.0", + "ghcr.io/rocker-org/tidyverse:4.4.0", + "docker.io/rocker/tidyverse:4.4", + "ghcr.io/rocker-org/tidyverse:4.4", + "docker.io/rocker/tidyverse:4", + "ghcr.io/rocker-org/tidyverse:4", + "docker.io/rocker/tidyverse:latest", + "ghcr.io/rocker-org/tidyverse:latest" + ] + }, + { + "IMAGE": "verse", + "labels": { + "org.opencontainers.image.title": "rocker/verse", + "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image." + }, + "FROM": "rocker/tidyverse:4.4.0", + "ENV": { + "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet", + "PATH": "$PATH:/usr/local/texlive/bin/linux" + }, + "RUN": [ + "/rocker_scripts/install_verse.sh" + ], + "tags": [ + "docker.io/rocker/verse:4.4.0", + "ghcr.io/rocker-org/verse:4.4.0", + "docker.io/rocker/verse:4.4", + "ghcr.io/rocker-org/verse:4.4", + "docker.io/rocker/verse:4", + "ghcr.io/rocker-org/verse:4", + "docker.io/rocker/verse:latest", + "ghcr.io/rocker-org/verse:latest" + ] + }, + { + "IMAGE": "geospatial", + "labels": { + "org.opencontainers.image.title": "rocker/geospatial", + "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." + }, + "FROM": "rocker/verse:4.4.0", + "RUN": "/rocker_scripts/install_geospatial.sh", + "tags": [ + "docker.io/rocker/geospatial:4.4.0", + "ghcr.io/rocker-org/geospatial:4.4.0", + "docker.io/rocker/geospatial:4.4", + "ghcr.io/rocker-org/geospatial:4.4", + "docker.io/rocker/geospatial:4", + "ghcr.io/rocker-org/geospatial:4", + "docker.io/rocker/geospatial:latest", + "ghcr.io/rocker-org/geospatial:latest" + ] + }, + { + "IMAGE": "shiny", + "labels": { + "org.opencontainers.image.title": "rocker/shiny", + "org.opencontainers.image.description": "Shiny Server on versioned Rocker image." + }, + "FROM": "rocker/r-ver:4.4.0", + "ENV": { + "S6_VERSION": "v2.1.0.2", + "SHINY_SERVER_VERSION": "latest", + "PANDOC_VERSION": "default" + }, + "RUN": "/rocker_scripts/install_shiny_server.sh", + "CMD": "[\"/init\"]", + "EXPOSE": 3838, + "tags": [ + "docker.io/rocker/shiny:4.4.0", + "ghcr.io/rocker-org/shiny:4.4.0", + "docker.io/rocker/shiny:4.4", + "ghcr.io/rocker-org/shiny:4.4", + "docker.io/rocker/shiny:4", + "ghcr.io/rocker-org/shiny:4", + "docker.io/rocker/shiny:latest", + "ghcr.io/rocker-org/shiny:latest" + ] + }, + { + "IMAGE": "shiny-verse", + "labels": { + "org.opencontainers.image.title": "rocker/shiny-verse", + "org.opencontainers.image.description": "Rocker Shiny image + Tidyverse R packages. Uses version-stable image." + }, + "FROM": "rocker/shiny:4.4.0", + "RUN": "/rocker_scripts/install_tidyverse.sh", + "tags": [ + "docker.io/rocker/shiny-verse:4.4.0", + "ghcr.io/rocker-org/shiny-verse:4.4.0", + "docker.io/rocker/shiny-verse:4.4", + "ghcr.io/rocker-org/shiny-verse:4.4", + "docker.io/rocker/shiny-verse:4", + "ghcr.io/rocker-org/shiny-verse:4", + "docker.io/rocker/shiny-verse:latest", + "ghcr.io/rocker-org/shiny-verse:latest" + ] + }, + { + "IMAGE": "binder", + "labels": { + "org.opencontainers.image.title": "rocker/binder", + "org.opencontainers.image.description": "Adds Jupyter to rocker/geospatial. RStudio Server can be started from Jupyter." + }, + "FROM": "rocker/geospatial:4.4.0", + "ENV": { + "NB_USER": "rstudio", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}" + }, + "RUN": [ + "/rocker_scripts/install_jupyter.sh" + ], + "USER": "${NB_USER}", + "WORKDIR": "/home/${NB_USER}", + "CMD": "[\"jupyter\", \"lab\", \"--ip\", \"0.0.0.0\", \"--no-browser\"]", + "EXPOSE": 8888, + "tags": [ + "docker.io/rocker/binder:4.4.0", + "ghcr.io/rocker-org/binder:4.4.0", + "docker.io/rocker/binder:4.4", + "ghcr.io/rocker-org/binder:4.4", + "docker.io/rocker/binder:4", + "ghcr.io/rocker-org/binder:4", + "docker.io/rocker/binder:latest", + "ghcr.io/rocker-org/binder:latest" + ] + }, + { + "IMAGE": "cuda", + "tags": [ + "docker.io/rocker/cuda:4.4.0", + "ghcr.io/rocker-org/cuda:4.4.0", + "docker.io/rocker/cuda:4.4", + "ghcr.io/rocker-org/cuda:4.4", + "docker.io/rocker/cuda:4", + "ghcr.io/rocker-org/cuda:4", + "docker.io/rocker/cuda:latest", + "ghcr.io/rocker-org/cuda:latest" + ], + "labels": { + "org.opencontainers.image.title": "rocker/cuda", + "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image." + }, + "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", + "ENV": { + "R_VERSION": "4.4.0", + "R_HOME": "/usr/local/lib/R", + "TZ": "Etc/UTC", + "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", + "PYTHON_CONFIGURE_OPTS": "--enable-shared", + "RETICULATE_AUTOCONFIGURE": "0", + "PURGE_BUILDDEPS": "false", + "VIRTUAL_ENV": "/opt/venv", + "PATH": "${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin" + }, + "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", + "RUN_a_script": "/rocker_scripts/install_R_source.sh", + "ENV_after_a_script": { + "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", + "LANG": "en_US.UTF-8" + }, + "COPY": "scripts /rocker_scripts", + "RUN": [ + "/rocker_scripts/setup_R.sh", + "/rocker_scripts/config_R_cuda.sh", + "/rocker_scripts/install_python.sh" + ], + "cache-from": [ + "docker.io/rocker/cuda:4.4.0" + ], + "cache-to": [ + "type=inline" + ] + }, + { + "IMAGE": "ml", + "tags": [ + "docker.io/rocker/ml:4.4.0", + "ghcr.io/rocker-org/ml:4.4.0", + "docker.io/rocker/ml:4.4", + "ghcr.io/rocker-org/ml:4.4", + "docker.io/rocker/ml:4", + "ghcr.io/rocker-org/ml:4", + "docker.io/rocker/ml:latest", + "ghcr.io/rocker-org/ml:latest" + ], + "labels": { + "org.opencontainers.image.title": "rocker/ml", + "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries." + }, + "FROM": "rocker/cuda:4.4.0", + "ENV": { + "S6_VERSION": "v2.1.0.2", + "RSTUDIO_VERSION": "2023.12.0+369", + "DEFAULT_USER": "rstudio", + "PANDOC_VERSION": "default", + "QUARTO_VERSION": "default" + }, + "RUN": [ + "/rocker_scripts/install_rstudio.sh", + "/rocker_scripts/install_pandoc.sh", + "/rocker_scripts/install_quarto.sh", + "/rocker_scripts/install_tidyverse.sh" + ], + "CMD": "[\"/init\"]", + "EXPOSE": 8787 + }, + { + "IMAGE": "ml-verse", + "tags": [ + "docker.io/rocker/ml-verse:4.4.0", + "ghcr.io/rocker-org/ml-verse:4.4.0", + "docker.io/rocker/ml-verse:4.4", + "ghcr.io/rocker-org/ml-verse:4.4", + "docker.io/rocker/ml-verse:4", + "ghcr.io/rocker-org/ml-verse:4", + "docker.io/rocker/ml-verse:latest", + "ghcr.io/rocker-org/ml-verse:latest" + ], + "labels": { + "org.opencontainers.image.title": "rocker/ml-verse", + "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages." + }, + "FROM": "rocker/ml:4.4.0", + "ENV": { + "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet" + }, + "RUN": [ + "/rocker_scripts/install_verse.sh", + "/rocker_scripts/install_geospatial.sh" + ] + } + ] +} diff --git a/stacks/extra.json b/stacks/extra.json index 30245054..e0711889 100644 --- a/stacks/extra.json +++ b/stacks/extra.json @@ -1,6 +1,6 @@ { "ordered": false, - "TAG": "4.3.3", + "TAG": "4.4.0", "LABEL": "org.opencontainers.image.licenses=\"GPL-2.0-or-later\" \\\n org.opencontainers.image.source=\"https://github.com/rocker-org/rocker-versioned2\" \\\n org.opencontainers.image.vendor=\"Rocker Project\" \\\n org.opencontainers.image.authors=\"Carl Boettiger \"", "group": [ { @@ -32,8 +32,8 @@ { "IMAGE": "geospatial-ubuntugis", "tags": [ - "docker.io/rocker/geospatial:4.3.3-ubuntugis", - "ghcr.io/rocker-org/geospatial:4.3.3-ubuntugis", + "docker.io/rocker/geospatial:4.4.0-ubuntugis", + "ghcr.io/rocker-org/geospatial:4.4.0-ubuntugis", "docker.io/rocker/geospatial:ubuntugis", "ghcr.io/rocker-org/geospatial:ubuntugis" ], @@ -41,7 +41,7 @@ "org.opencontainers.image.title": "rocker/geospatial on ubuntugis", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." }, - "FROM": "rocker/verse:4.3.3", + "FROM": "rocker/verse:4.4.0", "COPY": "scripts/experimental/install_geospatial_unstable.sh /rocker_scripts/experimental/install_geospatial_unstable.sh", "RUN": "/rocker_scripts/experimental/install_geospatial_unstable.sh", "cache-from": [ @@ -55,7 +55,7 @@ "org.opencontainers.image.title": "rocker/geospatial on dev-osgeo", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." }, - "FROM": "rocker/verse:4.3.3", + "FROM": "rocker/verse:4.4.0", "ENV": { "PROJ_VERSION": "9.4.0", "GDAL_VERSION": "3.8.5", From 706cd964be2f250604951b25bb06c61fd017a23e Mon Sep 17 00:00:00 2001 From: eitsupi Date: Wed, 24 Apr 2024 20:50:10 +0900 Subject: [PATCH 9/9] Revert "Automatic update of container definition files (#788)" This reverts commit 3a856a43aa42995176ae201124cc4ba9fe1fce85. --- bakefiles/4.3.3.docker-bake.json | 66 +++- bakefiles/4.4.0.docker-bake.json | 352 ------------------ bakefiles/extra.docker-bake.json | 16 +- build/matrix/all.json | 18 +- build/matrix/latest.json | 4 +- dockerfiles/binder_4.4.0.Dockerfile | 20 - dockerfiles/cuda_4.3.3.Dockerfile | 2 +- dockerfiles/cuda_4.4.0.Dockerfile | 29 -- ... => geospatial-dev-osgeo_4.3.3.Dockerfile} | 2 +- ... => geospatial-ubuntugis_4.3.3.Dockerfile} | 2 +- dockerfiles/geospatial_4.4.0.Dockerfile | 8 - dockerfiles/ml-verse_4.3.3.Dockerfile | 2 +- dockerfiles/ml-verse_4.4.0.Dockerfile | 11 - dockerfiles/ml_4.4.0.Dockerfile | 21 -- dockerfiles/r-ver_4.3.3.Dockerfile | 2 +- dockerfiles/r-ver_4.4.0.Dockerfile | 23 -- dockerfiles/rstudio_4.4.0.Dockerfile | 20 - dockerfiles/shiny-verse_4.4.0.Dockerfile | 8 - dockerfiles/shiny_4.4.0.Dockerfile | 16 - dockerfiles/tidyverse_4.4.0.Dockerfile | 8 - dockerfiles/verse_4.3.3.Dockerfile | 2 +- dockerfiles/verse_4.4.0.Dockerfile | 11 - stacks/4.3.3.json | 74 +++- stacks/4.4.0.json | 342 ----------------- stacks/extra.json | 10 +- 25 files changed, 148 insertions(+), 921 deletions(-) delete mode 100644 bakefiles/4.4.0.docker-bake.json delete mode 100644 dockerfiles/binder_4.4.0.Dockerfile delete mode 100644 dockerfiles/cuda_4.4.0.Dockerfile rename dockerfiles/{geospatial-dev-osgeo_4.4.0.Dockerfile => geospatial-dev-osgeo_4.3.3.Dockerfile} (95%) rename dockerfiles/{geospatial-ubuntugis_4.4.0.Dockerfile => geospatial-ubuntugis_4.3.3.Dockerfile} (95%) delete mode 100644 dockerfiles/geospatial_4.4.0.Dockerfile delete mode 100644 dockerfiles/ml-verse_4.4.0.Dockerfile delete mode 100644 dockerfiles/ml_4.4.0.Dockerfile delete mode 100644 dockerfiles/r-ver_4.4.0.Dockerfile delete mode 100644 dockerfiles/rstudio_4.4.0.Dockerfile delete mode 100644 dockerfiles/shiny-verse_4.4.0.Dockerfile delete mode 100644 dockerfiles/shiny_4.4.0.Dockerfile delete mode 100644 dockerfiles/tidyverse_4.4.0.Dockerfile delete mode 100644 dockerfiles/verse_4.4.0.Dockerfile delete mode 100644 stacks/4.4.0.json diff --git a/bakefiles/4.3.3.docker-bake.json b/bakefiles/4.3.3.docker-bake.json index 69a27e94..412692b3 100644 --- a/bakefiles/4.3.3.docker-bake.json +++ b/bakefiles/4.3.3.docker-bake.json @@ -40,7 +40,11 @@ "docker.io/rocker/r-ver:4.3.3", "ghcr.io/rocker-org/r-ver:4.3.3", "docker.io/rocker/r-ver:4.3", - "ghcr.io/rocker-org/r-ver:4.3" + "ghcr.io/rocker-org/r-ver:4.3", + "docker.io/rocker/r-ver:4", + "ghcr.io/rocker-org/r-ver:4", + "docker.io/rocker/r-ver:latest", + "ghcr.io/rocker-org/r-ver:latest" ], "platforms": [ "linux/amd64", @@ -66,7 +70,11 @@ "docker.io/rocker/rstudio:4.3.3", "ghcr.io/rocker-org/rstudio:4.3.3", "docker.io/rocker/rstudio:4.3", - "ghcr.io/rocker-org/rstudio:4.3" + "ghcr.io/rocker-org/rstudio:4.3", + "docker.io/rocker/rstudio:4", + "ghcr.io/rocker-org/rstudio:4", + "docker.io/rocker/rstudio:latest", + "ghcr.io/rocker-org/rstudio:latest" ], "platforms": [ "linux/amd64", @@ -92,7 +100,11 @@ "docker.io/rocker/tidyverse:4.3.3", "ghcr.io/rocker-org/tidyverse:4.3.3", "docker.io/rocker/tidyverse:4.3", - "ghcr.io/rocker-org/tidyverse:4.3" + "ghcr.io/rocker-org/tidyverse:4.3", + "docker.io/rocker/tidyverse:4", + "ghcr.io/rocker-org/tidyverse:4", + "docker.io/rocker/tidyverse:latest", + "ghcr.io/rocker-org/tidyverse:latest" ], "platforms": [ "linux/amd64" @@ -117,7 +129,11 @@ "docker.io/rocker/verse:4.3.3", "ghcr.io/rocker-org/verse:4.3.3", "docker.io/rocker/verse:4.3", - "ghcr.io/rocker-org/verse:4.3" + "ghcr.io/rocker-org/verse:4.3", + "docker.io/rocker/verse:4", + "ghcr.io/rocker-org/verse:4", + "docker.io/rocker/verse:latest", + "ghcr.io/rocker-org/verse:latest" ], "platforms": [ "linux/amd64" @@ -142,7 +158,11 @@ "docker.io/rocker/geospatial:4.3.3", "ghcr.io/rocker-org/geospatial:4.3.3", "docker.io/rocker/geospatial:4.3", - "ghcr.io/rocker-org/geospatial:4.3" + "ghcr.io/rocker-org/geospatial:4.3", + "docker.io/rocker/geospatial:4", + "ghcr.io/rocker-org/geospatial:4", + "docker.io/rocker/geospatial:latest", + "ghcr.io/rocker-org/geospatial:latest" ], "platforms": [ "linux/amd64" @@ -167,7 +187,11 @@ "docker.io/rocker/shiny:4.3.3", "ghcr.io/rocker-org/shiny:4.3.3", "docker.io/rocker/shiny:4.3", - "ghcr.io/rocker-org/shiny:4.3" + "ghcr.io/rocker-org/shiny:4.3", + "docker.io/rocker/shiny:4", + "ghcr.io/rocker-org/shiny:4", + "docker.io/rocker/shiny:latest", + "ghcr.io/rocker-org/shiny:latest" ], "platforms": [ "linux/amd64" @@ -192,7 +216,11 @@ "docker.io/rocker/shiny-verse:4.3.3", "ghcr.io/rocker-org/shiny-verse:4.3.3", "docker.io/rocker/shiny-verse:4.3", - "ghcr.io/rocker-org/shiny-verse:4.3" + "ghcr.io/rocker-org/shiny-verse:4.3", + "docker.io/rocker/shiny-verse:4", + "ghcr.io/rocker-org/shiny-verse:4", + "docker.io/rocker/shiny-verse:latest", + "ghcr.io/rocker-org/shiny-verse:latest" ], "platforms": [ "linux/amd64" @@ -217,7 +245,11 @@ "docker.io/rocker/binder:4.3.3", "ghcr.io/rocker-org/binder:4.3.3", "docker.io/rocker/binder:4.3", - "ghcr.io/rocker-org/binder:4.3" + "ghcr.io/rocker-org/binder:4.3", + "docker.io/rocker/binder:4", + "ghcr.io/rocker-org/binder:4", + "docker.io/rocker/binder:latest", + "ghcr.io/rocker-org/binder:latest" ], "platforms": [ "linux/amd64" @@ -242,7 +274,11 @@ "docker.io/rocker/cuda:4.3.3", "ghcr.io/rocker-org/cuda:4.3.3", "docker.io/rocker/cuda:4.3", - "ghcr.io/rocker-org/cuda:4.3" + "ghcr.io/rocker-org/cuda:4.3", + "docker.io/rocker/cuda:4", + "ghcr.io/rocker-org/cuda:4", + "docker.io/rocker/cuda:latest", + "ghcr.io/rocker-org/cuda:latest" ], "platforms": [ "linux/amd64" @@ -267,7 +303,11 @@ "docker.io/rocker/ml:4.3.3", "ghcr.io/rocker-org/ml:4.3.3", "docker.io/rocker/ml:4.3", - "ghcr.io/rocker-org/ml:4.3" + "ghcr.io/rocker-org/ml:4.3", + "docker.io/rocker/ml:4", + "ghcr.io/rocker-org/ml:4", + "docker.io/rocker/ml:latest", + "ghcr.io/rocker-org/ml:latest" ], "platforms": [ "linux/amd64" @@ -292,7 +332,11 @@ "docker.io/rocker/ml-verse:4.3.3", "ghcr.io/rocker-org/ml-verse:4.3.3", "docker.io/rocker/ml-verse:4.3", - "ghcr.io/rocker-org/ml-verse:4.3" + "ghcr.io/rocker-org/ml-verse:4.3", + "docker.io/rocker/ml-verse:4", + "ghcr.io/rocker-org/ml-verse:4", + "docker.io/rocker/ml-verse:latest", + "ghcr.io/rocker-org/ml-verse:latest" ], "platforms": [ "linux/amd64" diff --git a/bakefiles/4.4.0.docker-bake.json b/bakefiles/4.4.0.docker-bake.json deleted file mode 100644 index 2c4c5404..00000000 --- a/bakefiles/4.4.0.docker-bake.json +++ /dev/null @@ -1,352 +0,0 @@ -{ - "group": [ - { - "default": [ - { - "targets": [ - "r-ver", - "rstudio", - "tidyverse", - "verse", - "geospatial", - "shiny", - "shiny-verse", - "binder" - ] - } - ], - "cuda11images": [ - { - "targets": [ - "cuda", - "ml", - "ml-verse" - ] - } - ] - } - ], - "target": { - "r-ver": { - "context": "./", - "dockerfile": "dockerfiles/r-ver_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/r-ver", - "org.opencontainers.image.description": "Reproducible builds to fixed version of R", - "org.opencontainers.image.base.name": "docker.io/library/ubuntu:jammy", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/r-ver:4.4.0", - "ghcr.io/rocker-org/r-ver:4.4.0", - "docker.io/rocker/r-ver:4.4", - "ghcr.io/rocker-org/r-ver:4.4", - "docker.io/rocker/r-ver:4", - "ghcr.io/rocker-org/r-ver:4", - "docker.io/rocker/r-ver:latest", - "ghcr.io/rocker-org/r-ver:latest" - ], - "platforms": [ - "linux/amd64", - "linux/arm64" - ], - "cache-from": [ - "docker.io/rocker/r-ver:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "rstudio": { - "context": "./", - "dockerfile": "dockerfiles/rstudio_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/rstudio", - "org.opencontainers.image.description": "RStudio Server with fixed version of R", - "org.opencontainers.image.base.name": "docker.io/rocker/r-ver:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/rstudio:4.4.0", - "ghcr.io/rocker-org/rstudio:4.4.0", - "docker.io/rocker/rstudio:4.4", - "ghcr.io/rocker-org/rstudio:4.4", - "docker.io/rocker/rstudio:4", - "ghcr.io/rocker-org/rstudio:4", - "docker.io/rocker/rstudio:latest", - "ghcr.io/rocker-org/rstudio:latest" - ], - "platforms": [ - "linux/amd64", - "linux/arm64" - ], - "cache-from": [ - "docker.io/rocker/rstudio:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "tidyverse": { - "context": "./", - "dockerfile": "dockerfiles/tidyverse_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/tidyverse", - "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages.", - "org.opencontainers.image.base.name": "docker.io/rocker/rstudio:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/tidyverse:4.4.0", - "ghcr.io/rocker-org/tidyverse:4.4.0", - "docker.io/rocker/tidyverse:4.4", - "ghcr.io/rocker-org/tidyverse:4.4", - "docker.io/rocker/tidyverse:4", - "ghcr.io/rocker-org/tidyverse:4", - "docker.io/rocker/tidyverse:latest", - "ghcr.io/rocker-org/tidyverse:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/tidyverse:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "verse": { - "context": "./", - "dockerfile": "dockerfiles/verse_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/verse", - "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image.", - "org.opencontainers.image.base.name": "docker.io/rocker/tidyverse:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/verse:4.4.0", - "ghcr.io/rocker-org/verse:4.4.0", - "docker.io/rocker/verse:4.4", - "ghcr.io/rocker-org/verse:4.4", - "docker.io/rocker/verse:4", - "ghcr.io/rocker-org/verse:4", - "docker.io/rocker/verse:latest", - "ghcr.io/rocker-org/verse:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/verse:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "geospatial": { - "context": "./", - "dockerfile": "dockerfiles/geospatial_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/geospatial", - "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/geospatial:4.4.0", - "ghcr.io/rocker-org/geospatial:4.4.0", - "docker.io/rocker/geospatial:4.4", - "ghcr.io/rocker-org/geospatial:4.4", - "docker.io/rocker/geospatial:4", - "ghcr.io/rocker-org/geospatial:4", - "docker.io/rocker/geospatial:latest", - "ghcr.io/rocker-org/geospatial:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/geospatial:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "shiny": { - "context": "./", - "dockerfile": "dockerfiles/shiny_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/shiny", - "org.opencontainers.image.description": "Shiny Server on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/r-ver:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/shiny:4.4.0", - "ghcr.io/rocker-org/shiny:4.4.0", - "docker.io/rocker/shiny:4.4", - "ghcr.io/rocker-org/shiny:4.4", - "docker.io/rocker/shiny:4", - "ghcr.io/rocker-org/shiny:4", - "docker.io/rocker/shiny:latest", - "ghcr.io/rocker-org/shiny:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/shiny:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "shiny-verse": { - "context": "./", - "dockerfile": "dockerfiles/shiny-verse_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/shiny-verse", - "org.opencontainers.image.description": "Rocker Shiny image + Tidyverse R packages. Uses version-stable image.", - "org.opencontainers.image.base.name": "docker.io/rocker/shiny:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/shiny-verse:4.4.0", - "ghcr.io/rocker-org/shiny-verse:4.4.0", - "docker.io/rocker/shiny-verse:4.4", - "ghcr.io/rocker-org/shiny-verse:4.4", - "docker.io/rocker/shiny-verse:4", - "ghcr.io/rocker-org/shiny-verse:4", - "docker.io/rocker/shiny-verse:latest", - "ghcr.io/rocker-org/shiny-verse:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/shiny-verse:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "binder": { - "context": "./", - "dockerfile": "dockerfiles/binder_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/binder", - "org.opencontainers.image.description": "Adds Jupyter to rocker/geospatial. RStudio Server can be started from Jupyter.", - "org.opencontainers.image.base.name": "docker.io/rocker/geospatial:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/binder:4.4.0", - "ghcr.io/rocker-org/binder:4.4.0", - "docker.io/rocker/binder:4.4", - "ghcr.io/rocker-org/binder:4.4", - "docker.io/rocker/binder:4", - "ghcr.io/rocker-org/binder:4", - "docker.io/rocker/binder:latest", - "ghcr.io/rocker-org/binder:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/binder:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "cuda": { - "context": "./", - "dockerfile": "dockerfiles/cuda_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/cuda", - "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image.", - "org.opencontainers.image.base.name": "docker.io/nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/cuda:4.4.0", - "ghcr.io/rocker-org/cuda:4.4.0", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "ml": { - "context": "./", - "dockerfile": "dockerfiles/ml_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries.", - "org.opencontainers.image.base.name": "docker.io/rocker/cuda:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/ml:4.4.0", - "ghcr.io/rocker-org/ml:4.4.0", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/ml:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - "ml-verse": { - "context": "./", - "dockerfile": "dockerfiles/ml-verse_4.4.0.Dockerfile", - "labels": { - "org.opencontainers.image.title": "rocker/ml-verse", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages.", - "org.opencontainers.image.base.name": "docker.io/rocker/ml:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" - }, - "tags": [ - "docker.io/rocker/ml-verse:4.4.0", - "ghcr.io/rocker-org/ml-verse:4.4.0", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ], - "platforms": [ - "linux/amd64" - ], - "cache-from": [ - "docker.io/rocker/ml-verse:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - } - } -} diff --git a/bakefiles/extra.docker-bake.json b/bakefiles/extra.docker-bake.json index 71afa156..bafb4567 100644 --- a/bakefiles/extra.docker-bake.json +++ b/bakefiles/extra.docker-bake.json @@ -28,16 +28,16 @@ "target": { "geospatial-ubuntugis": { "context": "./", - "dockerfile": "dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile", + "dockerfile": "dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/geospatial on ubuntugis", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" + "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.3.3", + "org.opencontainers.image.version": "R-4.3.3" }, "tags": [ - "docker.io/rocker/geospatial:4.4.0-ubuntugis", - "ghcr.io/rocker-org/geospatial:4.4.0-ubuntugis", + "docker.io/rocker/geospatial:4.3.3-ubuntugis", + "ghcr.io/rocker-org/geospatial:4.3.3-ubuntugis", "docker.io/rocker/geospatial:ubuntugis", "ghcr.io/rocker-org/geospatial:ubuntugis" ], @@ -53,12 +53,12 @@ }, "geospatial-dev-osgeo": { "context": "./", - "dockerfile": "dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile", + "dockerfile": "dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/geospatial on dev-osgeo", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", - "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.4.0", - "org.opencontainers.image.version": "R-4.4.0" + "org.opencontainers.image.base.name": "docker.io/rocker/verse:4.3.3", + "org.opencontainers.image.version": "R-4.3.3" }, "tags": [ "docker.io/rocker/geospatial:dev-osgeo", diff --git a/build/matrix/all.json b/build/matrix/all.json index 8d8aa31a..734766cf 100644 --- a/build/matrix/all.json +++ b/build/matrix/all.json @@ -1,11 +1,23 @@ { - "r_version": ["4.0.5", "4.1.3", "4.2.3", "4.3.0", "4.3.1", "4.3.2", "4.3.3", "4.4.0"], + "r_version": ["4.0.5", "4.1.3", "4.2.0", "4.2.1", "4.2.2", "4.2.3", "4.3.0", "4.3.1", "4.3.2", "4.3.3"], "group": ["default"], "include": [ { "r_version": "4.1.3", "group": "cuda11images" }, + { + "r_version": "4.2.0", + "group": "cuda11images" + }, + { + "r_version": "4.2.1", + "group": "cuda11images" + }, + { + "r_version": "4.2.2", + "group": "cuda11images" + }, { "r_version": "4.2.3", "group": "cuda11images" @@ -25,10 +37,6 @@ { "r_version": "4.3.3", "group": "cuda11images" - }, - { - "r_version": "4.4.0", - "group": "cuda11images" } ] } diff --git a/build/matrix/latest.json b/build/matrix/latest.json index 78236b44..192092e6 100644 --- a/build/matrix/latest.json +++ b/build/matrix/latest.json @@ -1,9 +1,9 @@ { - "r_version": ["4.4.0"], + "r_version": ["4.3.3"], "group": ["default"], "include": [ { - "r_version": "4.4.0", + "r_version": "4.3.3", "group": "cuda11images" } ] diff --git a/dockerfiles/binder_4.4.0.Dockerfile b/dockerfiles/binder_4.4.0.Dockerfile deleted file mode 100644 index 09a4b04f..00000000 --- a/dockerfiles/binder_4.4.0.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM rocker/geospatial:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV NB_USER=rstudio -ENV VIRTUAL_ENV=/opt/venv -ENV PATH=${VIRTUAL_ENV}/bin:${PATH} - -RUN /rocker_scripts/install_jupyter.sh - -EXPOSE 8888 - -CMD ["jupyter", "lab", "--ip", "0.0.0.0", "--no-browser"] - -USER ${NB_USER} - -WORKDIR /home/${NB_USER} diff --git a/dockerfiles/cuda_4.3.3.Dockerfile b/dockerfiles/cuda_4.3.3.Dockerfile index 5f9b6168..54ce9f9d 100644 --- a/dockerfiles/cuda_4.3.3.Dockerfile +++ b/dockerfiles/cuda_4.3.3.Dockerfile @@ -19,7 +19,7 @@ COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh RUN /rocker_scripts/install_R_source.sh -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/2024-04-23 +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest ENV LANG=en_US.UTF-8 COPY scripts /rocker_scripts diff --git a/dockerfiles/cuda_4.4.0.Dockerfile b/dockerfiles/cuda_4.4.0.Dockerfile deleted file mode 100644 index 335cbb51..00000000 --- a/dockerfiles/cuda_4.4.0.Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV R_VERSION=4.4.0 -ENV R_HOME=/usr/local/lib/R -ENV TZ=Etc/UTC -ENV NVBLAS_CONFIG_FILE=/etc/nvblas.conf -ENV PYTHON_CONFIGURE_OPTS=--enable-shared -ENV RETICULATE_AUTOCONFIGURE=0 -ENV PURGE_BUILDDEPS=false -ENV VIRTUAL_ENV=/opt/venv -ENV PATH=${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin - -COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh - -RUN /rocker_scripts/install_R_source.sh - -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest -ENV LANG=en_US.UTF-8 - -COPY scripts /rocker_scripts - -RUN /rocker_scripts/setup_R.sh -RUN /rocker_scripts/config_R_cuda.sh -RUN /rocker_scripts/install_python.sh diff --git a/dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile b/dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile similarity index 95% rename from dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile rename to dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile index 851a4437..a2719c61 100644 --- a/dockerfiles/geospatial-dev-osgeo_4.4.0.Dockerfile +++ b/dockerfiles/geospatial-dev-osgeo_4.3.3.Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:4.4.0 +FROM rocker/verse:4.3.3 LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ diff --git a/dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile b/dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile similarity index 95% rename from dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile rename to dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile index bf38a730..e4a20e43 100644 --- a/dockerfiles/geospatial-ubuntugis_4.4.0.Dockerfile +++ b/dockerfiles/geospatial-ubuntugis_4.3.3.Dockerfile @@ -1,4 +1,4 @@ -FROM rocker/verse:4.4.0 +FROM rocker/verse:4.3.3 LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ diff --git a/dockerfiles/geospatial_4.4.0.Dockerfile b/dockerfiles/geospatial_4.4.0.Dockerfile deleted file mode 100644 index 09330fe4..00000000 --- a/dockerfiles/geospatial_4.4.0.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM rocker/verse:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml-verse_4.3.3.Dockerfile b/dockerfiles/ml-verse_4.3.3.Dockerfile index 2305bd16..8d627371 100644 --- a/dockerfiles/ml-verse_4.3.3.Dockerfile +++ b/dockerfiles/ml-verse_4.3.3.Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.vendor="Rocker Project" \ org.opencontainers.image.authors="Carl Boettiger " -ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2024/04/23/tlnet +ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet RUN /rocker_scripts/install_verse.sh RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml-verse_4.4.0.Dockerfile b/dockerfiles/ml-verse_4.4.0.Dockerfile deleted file mode 100644 index 53698d4b..00000000 --- a/dockerfiles/ml-verse_4.4.0.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM rocker/ml:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet - -RUN /rocker_scripts/install_verse.sh -RUN /rocker_scripts/install_geospatial.sh diff --git a/dockerfiles/ml_4.4.0.Dockerfile b/dockerfiles/ml_4.4.0.Dockerfile deleted file mode 100644 index 9beadfcf..00000000 --- a/dockerfiles/ml_4.4.0.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM rocker/cuda:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV S6_VERSION=v2.1.0.2 -ENV RSTUDIO_VERSION=2023.12.0+369 -ENV DEFAULT_USER=rstudio -ENV PANDOC_VERSION=default -ENV QUARTO_VERSION=default - -RUN /rocker_scripts/install_rstudio.sh -RUN /rocker_scripts/install_pandoc.sh -RUN /rocker_scripts/install_quarto.sh -RUN /rocker_scripts/install_tidyverse.sh - -EXPOSE 8787 - -CMD ["/init"] diff --git a/dockerfiles/r-ver_4.3.3.Dockerfile b/dockerfiles/r-ver_4.3.3.Dockerfile index 129e71de..e810129b 100644 --- a/dockerfiles/r-ver_4.3.3.Dockerfile +++ b/dockerfiles/r-ver_4.3.3.Dockerfile @@ -13,7 +13,7 @@ COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh RUN /rocker_scripts/install_R_source.sh -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/2024-04-23 +ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest ENV LANG=en_US.UTF-8 COPY scripts /rocker_scripts diff --git a/dockerfiles/r-ver_4.4.0.Dockerfile b/dockerfiles/r-ver_4.4.0.Dockerfile deleted file mode 100644 index e02eeb68..00000000 --- a/dockerfiles/r-ver_4.4.0.Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM ubuntu:jammy - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV R_VERSION=4.4.0 -ENV R_HOME=/usr/local/lib/R -ENV TZ=Etc/UTC - -COPY scripts/install_R_source.sh /rocker_scripts/install_R_source.sh - -RUN /rocker_scripts/install_R_source.sh - -ENV CRAN=https://p3m.dev/cran/__linux__/jammy/latest -ENV LANG=en_US.UTF-8 - -COPY scripts /rocker_scripts - -RUN /rocker_scripts/setup_R.sh - -CMD ["R"] diff --git a/dockerfiles/rstudio_4.4.0.Dockerfile b/dockerfiles/rstudio_4.4.0.Dockerfile deleted file mode 100644 index 1de40b5d..00000000 --- a/dockerfiles/rstudio_4.4.0.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM rocker/r-ver:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV S6_VERSION=v2.1.0.2 -ENV RSTUDIO_VERSION=2023.12.0+369 -ENV DEFAULT_USER=rstudio -ENV PANDOC_VERSION=default -ENV QUARTO_VERSION=default - -RUN /rocker_scripts/install_rstudio.sh -RUN /rocker_scripts/install_pandoc.sh -RUN /rocker_scripts/install_quarto.sh - -EXPOSE 8787 - -CMD ["/init"] diff --git a/dockerfiles/shiny-verse_4.4.0.Dockerfile b/dockerfiles/shiny-verse_4.4.0.Dockerfile deleted file mode 100644 index 250f673c..00000000 --- a/dockerfiles/shiny-verse_4.4.0.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM rocker/shiny:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -RUN /rocker_scripts/install_tidyverse.sh diff --git a/dockerfiles/shiny_4.4.0.Dockerfile b/dockerfiles/shiny_4.4.0.Dockerfile deleted file mode 100644 index 3ee86ede..00000000 --- a/dockerfiles/shiny_4.4.0.Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM rocker/r-ver:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV S6_VERSION=v2.1.0.2 -ENV SHINY_SERVER_VERSION=latest -ENV PANDOC_VERSION=default - -RUN /rocker_scripts/install_shiny_server.sh - -EXPOSE 3838 - -CMD ["/init"] diff --git a/dockerfiles/tidyverse_4.4.0.Dockerfile b/dockerfiles/tidyverse_4.4.0.Dockerfile deleted file mode 100644 index c18f9caf..00000000 --- a/dockerfiles/tidyverse_4.4.0.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM rocker/rstudio:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -RUN /rocker_scripts/install_tidyverse.sh diff --git a/dockerfiles/verse_4.3.3.Dockerfile b/dockerfiles/verse_4.3.3.Dockerfile index 21aeb44e..1df3da3c 100644 --- a/dockerfiles/verse_4.3.3.Dockerfile +++ b/dockerfiles/verse_4.3.3.Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ org.opencontainers.image.vendor="Rocker Project" \ org.opencontainers.image.authors="Carl Boettiger " -ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2024/04/23/tlnet +ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet ENV PATH=$PATH:/usr/local/texlive/bin/linux RUN /rocker_scripts/install_verse.sh diff --git a/dockerfiles/verse_4.4.0.Dockerfile b/dockerfiles/verse_4.4.0.Dockerfile deleted file mode 100644 index 2fd9fec3..00000000 --- a/dockerfiles/verse_4.4.0.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM rocker/tidyverse:4.4.0 - -LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \ - org.opencontainers.image.source="https://github.com/rocker-org/rocker-versioned2" \ - org.opencontainers.image.vendor="Rocker Project" \ - org.opencontainers.image.authors="Carl Boettiger " - -ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet -ENV PATH=$PATH:/usr/local/texlive/bin/linux - -RUN /rocker_scripts/install_verse.sh diff --git a/stacks/4.3.3.json b/stacks/4.3.3.json index 3787815e..261c3156 100644 --- a/stacks/4.3.3.json +++ b/stacks/4.3.3.json @@ -32,7 +32,7 @@ "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/2024-04-23", + "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", "LANG": "en_US.UTF-8" }, "COPY": "scripts /rocker_scripts", @@ -42,7 +42,11 @@ "docker.io/rocker/r-ver:4.3.3", "ghcr.io/rocker-org/r-ver:4.3.3", "docker.io/rocker/r-ver:4.3", - "ghcr.io/rocker-org/r-ver:4.3" + "ghcr.io/rocker-org/r-ver:4.3", + "docker.io/rocker/r-ver:4", + "ghcr.io/rocker-org/r-ver:4", + "docker.io/rocker/r-ver:latest", + "ghcr.io/rocker-org/r-ver:latest" ], "platforms": [ "linux/amd64", @@ -80,7 +84,11 @@ "docker.io/rocker/rstudio:4.3.3", "ghcr.io/rocker-org/rstudio:4.3.3", "docker.io/rocker/rstudio:4.3", - "ghcr.io/rocker-org/rstudio:4.3" + "ghcr.io/rocker-org/rstudio:4.3", + "docker.io/rocker/rstudio:4", + "ghcr.io/rocker-org/rstudio:4", + "docker.io/rocker/rstudio:latest", + "ghcr.io/rocker-org/rstudio:latest" ], "platforms": [ "linux/amd64", @@ -99,7 +107,11 @@ "docker.io/rocker/tidyverse:4.3.3", "ghcr.io/rocker-org/tidyverse:4.3.3", "docker.io/rocker/tidyverse:4.3", - "ghcr.io/rocker-org/tidyverse:4.3" + "ghcr.io/rocker-org/tidyverse:4.3", + "docker.io/rocker/tidyverse:4", + "ghcr.io/rocker-org/tidyverse:4", + "docker.io/rocker/tidyverse:latest", + "ghcr.io/rocker-org/tidyverse:latest" ] }, { @@ -110,7 +122,7 @@ }, "FROM": "rocker/tidyverse:4.3.3", "ENV": { - "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2024/04/23/tlnet", + "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet", "PATH": "$PATH:/usr/local/texlive/bin/linux" }, "RUN": [ @@ -120,7 +132,11 @@ "docker.io/rocker/verse:4.3.3", "ghcr.io/rocker-org/verse:4.3.3", "docker.io/rocker/verse:4.3", - "ghcr.io/rocker-org/verse:4.3" + "ghcr.io/rocker-org/verse:4.3", + "docker.io/rocker/verse:4", + "ghcr.io/rocker-org/verse:4", + "docker.io/rocker/verse:latest", + "ghcr.io/rocker-org/verse:latest" ] }, { @@ -135,7 +151,11 @@ "docker.io/rocker/geospatial:4.3.3", "ghcr.io/rocker-org/geospatial:4.3.3", "docker.io/rocker/geospatial:4.3", - "ghcr.io/rocker-org/geospatial:4.3" + "ghcr.io/rocker-org/geospatial:4.3", + "docker.io/rocker/geospatial:4", + "ghcr.io/rocker-org/geospatial:4", + "docker.io/rocker/geospatial:latest", + "ghcr.io/rocker-org/geospatial:latest" ] }, { @@ -157,7 +177,11 @@ "docker.io/rocker/shiny:4.3.3", "ghcr.io/rocker-org/shiny:4.3.3", "docker.io/rocker/shiny:4.3", - "ghcr.io/rocker-org/shiny:4.3" + "ghcr.io/rocker-org/shiny:4.3", + "docker.io/rocker/shiny:4", + "ghcr.io/rocker-org/shiny:4", + "docker.io/rocker/shiny:latest", + "ghcr.io/rocker-org/shiny:latest" ] }, { @@ -172,7 +196,11 @@ "docker.io/rocker/shiny-verse:4.3.3", "ghcr.io/rocker-org/shiny-verse:4.3.3", "docker.io/rocker/shiny-verse:4.3", - "ghcr.io/rocker-org/shiny-verse:4.3" + "ghcr.io/rocker-org/shiny-verse:4.3", + "docker.io/rocker/shiny-verse:4", + "ghcr.io/rocker-org/shiny-verse:4", + "docker.io/rocker/shiny-verse:latest", + "ghcr.io/rocker-org/shiny-verse:latest" ] }, { @@ -198,7 +226,11 @@ "docker.io/rocker/binder:4.3.3", "ghcr.io/rocker-org/binder:4.3.3", "docker.io/rocker/binder:4.3", - "ghcr.io/rocker-org/binder:4.3" + "ghcr.io/rocker-org/binder:4.3", + "docker.io/rocker/binder:4", + "ghcr.io/rocker-org/binder:4", + "docker.io/rocker/binder:latest", + "ghcr.io/rocker-org/binder:latest" ] }, { @@ -207,7 +239,11 @@ "docker.io/rocker/cuda:4.3.3", "ghcr.io/rocker-org/cuda:4.3.3", "docker.io/rocker/cuda:4.3", - "ghcr.io/rocker-org/cuda:4.3" + "ghcr.io/rocker-org/cuda:4.3", + "docker.io/rocker/cuda:4", + "ghcr.io/rocker-org/cuda:4", + "docker.io/rocker/cuda:latest", + "ghcr.io/rocker-org/cuda:latest" ], "labels": { "org.opencontainers.image.title": "rocker/cuda", @@ -228,7 +264,7 @@ "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", "RUN_a_script": "/rocker_scripts/install_R_source.sh", "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/2024-04-23", + "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", "LANG": "en_US.UTF-8" }, "COPY": "scripts /rocker_scripts", @@ -250,7 +286,11 @@ "docker.io/rocker/ml:4.3.3", "ghcr.io/rocker-org/ml:4.3.3", "docker.io/rocker/ml:4.3", - "ghcr.io/rocker-org/ml:4.3" + "ghcr.io/rocker-org/ml:4.3", + "docker.io/rocker/ml:4", + "ghcr.io/rocker-org/ml:4", + "docker.io/rocker/ml:latest", + "ghcr.io/rocker-org/ml:latest" ], "labels": { "org.opencontainers.image.title": "rocker/ml", @@ -279,7 +319,11 @@ "docker.io/rocker/ml-verse:4.3.3", "ghcr.io/rocker-org/ml-verse:4.3.3", "docker.io/rocker/ml-verse:4.3", - "ghcr.io/rocker-org/ml-verse:4.3" + "ghcr.io/rocker-org/ml-verse:4.3", + "docker.io/rocker/ml-verse:4", + "ghcr.io/rocker-org/ml-verse:4", + "docker.io/rocker/ml-verse:latest", + "ghcr.io/rocker-org/ml-verse:latest" ], "labels": { "org.opencontainers.image.title": "rocker/ml-verse", @@ -287,7 +331,7 @@ }, "FROM": "rocker/ml:4.3.3", "ENV": { - "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2024/04/23/tlnet" + "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet" }, "RUN": [ "/rocker_scripts/install_verse.sh", diff --git a/stacks/4.4.0.json b/stacks/4.4.0.json deleted file mode 100644 index f001dd9b..00000000 --- a/stacks/4.4.0.json +++ /dev/null @@ -1,342 +0,0 @@ -{ - "ordered": true, - "TAG": "4.4.0", - "LABEL": "org.opencontainers.image.licenses=\"GPL-2.0-or-later\" \\\n org.opencontainers.image.source=\"https://github.com/rocker-org/rocker-versioned2\" \\\n org.opencontainers.image.vendor=\"Rocker Project\" \\\n org.opencontainers.image.authors=\"Carl Boettiger \"", - "group": [ - { - "default": [ - { - "targets": ["r-ver", "rstudio", "tidyverse", "verse", "geospatial", "shiny", "shiny-verse", "binder"] - } - ], - "cuda11images": [ - { - "targets": ["cuda", "ml", "ml-verse"] - } - ] - } - ], - "stack": [ - { - "IMAGE": "r-ver", - "labels": { - "org.opencontainers.image.title": "rocker/r-ver", - "org.opencontainers.image.description": "Reproducible builds to fixed version of R" - }, - "FROM": "ubuntu:jammy", - "ENV": { - "R_VERSION": "4.4.0", - "R_HOME": "/usr/local/lib/R", - "TZ": "Etc/UTC" - }, - "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", - "RUN_a_script": "/rocker_scripts/install_R_source.sh", - "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", - "LANG": "en_US.UTF-8" - }, - "COPY": "scripts /rocker_scripts", - "RUN": "/rocker_scripts/setup_R.sh", - "CMD": "[\"R\"]", - "tags": [ - "docker.io/rocker/r-ver:4.4.0", - "ghcr.io/rocker-org/r-ver:4.4.0", - "docker.io/rocker/r-ver:4.4", - "ghcr.io/rocker-org/r-ver:4.4", - "docker.io/rocker/r-ver:4", - "ghcr.io/rocker-org/r-ver:4", - "docker.io/rocker/r-ver:latest", - "ghcr.io/rocker-org/r-ver:latest" - ], - "platforms": [ - "linux/amd64", - "linux/arm64" - ], - "cache-from": [ - "docker.io/rocker/r-ver:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - { - "IMAGE": "rstudio", - "labels": { - "org.opencontainers.image.title": "rocker/rstudio", - "org.opencontainers.image.description": "RStudio Server with fixed version of R" - }, - "FROM": "rocker/r-ver:4.4.0", - "ENV": { - "S6_VERSION": "v2.1.0.2", - "RSTUDIO_VERSION": "2023.12.0+369", - "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default" - }, - "RUN": [ - "/rocker_scripts/install_rstudio.sh", - "/rocker_scripts/install_pandoc.sh", - "/rocker_scripts/install_quarto.sh" - ], - "CMD": "[\"/init\"]", - "EXPOSE": 8787, - "tags": [ - "docker.io/rocker/rstudio:4.4.0", - "ghcr.io/rocker-org/rstudio:4.4.0", - "docker.io/rocker/rstudio:4.4", - "ghcr.io/rocker-org/rstudio:4.4", - "docker.io/rocker/rstudio:4", - "ghcr.io/rocker-org/rstudio:4", - "docker.io/rocker/rstudio:latest", - "ghcr.io/rocker-org/rstudio:latest" - ], - "platforms": [ - "linux/amd64", - "linux/arm64" - ] - }, - { - "IMAGE": "tidyverse", - "labels": { - "org.opencontainers.image.title": "rocker/tidyverse", - "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages." - }, - "FROM": "rocker/rstudio:4.4.0", - "RUN": "/rocker_scripts/install_tidyverse.sh", - "tags": [ - "docker.io/rocker/tidyverse:4.4.0", - "ghcr.io/rocker-org/tidyverse:4.4.0", - "docker.io/rocker/tidyverse:4.4", - "ghcr.io/rocker-org/tidyverse:4.4", - "docker.io/rocker/tidyverse:4", - "ghcr.io/rocker-org/tidyverse:4", - "docker.io/rocker/tidyverse:latest", - "ghcr.io/rocker-org/tidyverse:latest" - ] - }, - { - "IMAGE": "verse", - "labels": { - "org.opencontainers.image.title": "rocker/verse", - "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image." - }, - "FROM": "rocker/tidyverse:4.4.0", - "ENV": { - "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet", - "PATH": "$PATH:/usr/local/texlive/bin/linux" - }, - "RUN": [ - "/rocker_scripts/install_verse.sh" - ], - "tags": [ - "docker.io/rocker/verse:4.4.0", - "ghcr.io/rocker-org/verse:4.4.0", - "docker.io/rocker/verse:4.4", - "ghcr.io/rocker-org/verse:4.4", - "docker.io/rocker/verse:4", - "ghcr.io/rocker-org/verse:4", - "docker.io/rocker/verse:latest", - "ghcr.io/rocker-org/verse:latest" - ] - }, - { - "IMAGE": "geospatial", - "labels": { - "org.opencontainers.image.title": "rocker/geospatial", - "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." - }, - "FROM": "rocker/verse:4.4.0", - "RUN": "/rocker_scripts/install_geospatial.sh", - "tags": [ - "docker.io/rocker/geospatial:4.4.0", - "ghcr.io/rocker-org/geospatial:4.4.0", - "docker.io/rocker/geospatial:4.4", - "ghcr.io/rocker-org/geospatial:4.4", - "docker.io/rocker/geospatial:4", - "ghcr.io/rocker-org/geospatial:4", - "docker.io/rocker/geospatial:latest", - "ghcr.io/rocker-org/geospatial:latest" - ] - }, - { - "IMAGE": "shiny", - "labels": { - "org.opencontainers.image.title": "rocker/shiny", - "org.opencontainers.image.description": "Shiny Server on versioned Rocker image." - }, - "FROM": "rocker/r-ver:4.4.0", - "ENV": { - "S6_VERSION": "v2.1.0.2", - "SHINY_SERVER_VERSION": "latest", - "PANDOC_VERSION": "default" - }, - "RUN": "/rocker_scripts/install_shiny_server.sh", - "CMD": "[\"/init\"]", - "EXPOSE": 3838, - "tags": [ - "docker.io/rocker/shiny:4.4.0", - "ghcr.io/rocker-org/shiny:4.4.0", - "docker.io/rocker/shiny:4.4", - "ghcr.io/rocker-org/shiny:4.4", - "docker.io/rocker/shiny:4", - "ghcr.io/rocker-org/shiny:4", - "docker.io/rocker/shiny:latest", - "ghcr.io/rocker-org/shiny:latest" - ] - }, - { - "IMAGE": "shiny-verse", - "labels": { - "org.opencontainers.image.title": "rocker/shiny-verse", - "org.opencontainers.image.description": "Rocker Shiny image + Tidyverse R packages. Uses version-stable image." - }, - "FROM": "rocker/shiny:4.4.0", - "RUN": "/rocker_scripts/install_tidyverse.sh", - "tags": [ - "docker.io/rocker/shiny-verse:4.4.0", - "ghcr.io/rocker-org/shiny-verse:4.4.0", - "docker.io/rocker/shiny-verse:4.4", - "ghcr.io/rocker-org/shiny-verse:4.4", - "docker.io/rocker/shiny-verse:4", - "ghcr.io/rocker-org/shiny-verse:4", - "docker.io/rocker/shiny-verse:latest", - "ghcr.io/rocker-org/shiny-verse:latest" - ] - }, - { - "IMAGE": "binder", - "labels": { - "org.opencontainers.image.title": "rocker/binder", - "org.opencontainers.image.description": "Adds Jupyter to rocker/geospatial. RStudio Server can be started from Jupyter." - }, - "FROM": "rocker/geospatial:4.4.0", - "ENV": { - "NB_USER": "rstudio", - "VIRTUAL_ENV": "/opt/venv", - "PATH": "${VIRTUAL_ENV}/bin:${PATH}" - }, - "RUN": [ - "/rocker_scripts/install_jupyter.sh" - ], - "USER": "${NB_USER}", - "WORKDIR": "/home/${NB_USER}", - "CMD": "[\"jupyter\", \"lab\", \"--ip\", \"0.0.0.0\", \"--no-browser\"]", - "EXPOSE": 8888, - "tags": [ - "docker.io/rocker/binder:4.4.0", - "ghcr.io/rocker-org/binder:4.4.0", - "docker.io/rocker/binder:4.4", - "ghcr.io/rocker-org/binder:4.4", - "docker.io/rocker/binder:4", - "ghcr.io/rocker-org/binder:4", - "docker.io/rocker/binder:latest", - "ghcr.io/rocker-org/binder:latest" - ] - }, - { - "IMAGE": "cuda", - "tags": [ - "docker.io/rocker/cuda:4.4.0", - "ghcr.io/rocker-org/cuda:4.4.0", - "docker.io/rocker/cuda:4.4", - "ghcr.io/rocker-org/cuda:4.4", - "docker.io/rocker/cuda:4", - "ghcr.io/rocker-org/cuda:4", - "docker.io/rocker/cuda:latest", - "ghcr.io/rocker-org/cuda:latest" - ], - "labels": { - "org.opencontainers.image.title": "rocker/cuda", - "org.opencontainers.image.description": "NVIDIA CUDA libraries added to Rocker image." - }, - "FROM": "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04", - "ENV": { - "R_VERSION": "4.4.0", - "R_HOME": "/usr/local/lib/R", - "TZ": "Etc/UTC", - "NVBLAS_CONFIG_FILE": "/etc/nvblas.conf", - "PYTHON_CONFIGURE_OPTS": "--enable-shared", - "RETICULATE_AUTOCONFIGURE": "0", - "PURGE_BUILDDEPS": "false", - "VIRTUAL_ENV": "/opt/venv", - "PATH": "${VIRTUAL_ENV}/bin:${PATH}:${CUDA_HOME}/bin" - }, - "COPY_a_script": "scripts/install_R_source.sh /rocker_scripts/install_R_source.sh", - "RUN_a_script": "/rocker_scripts/install_R_source.sh", - "ENV_after_a_script": { - "CRAN": "https://p3m.dev/cran/__linux__/jammy/latest", - "LANG": "en_US.UTF-8" - }, - "COPY": "scripts /rocker_scripts", - "RUN": [ - "/rocker_scripts/setup_R.sh", - "/rocker_scripts/config_R_cuda.sh", - "/rocker_scripts/install_python.sh" - ], - "cache-from": [ - "docker.io/rocker/cuda:4.4.0" - ], - "cache-to": [ - "type=inline" - ] - }, - { - "IMAGE": "ml", - "tags": [ - "docker.io/rocker/ml:4.4.0", - "ghcr.io/rocker-org/ml:4.4.0", - "docker.io/rocker/ml:4.4", - "ghcr.io/rocker-org/ml:4.4", - "docker.io/rocker/ml:4", - "ghcr.io/rocker-org/ml:4", - "docker.io/rocker/ml:latest", - "ghcr.io/rocker-org/ml:latest" - ], - "labels": { - "org.opencontainers.image.title": "rocker/ml", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries." - }, - "FROM": "rocker/cuda:4.4.0", - "ENV": { - "S6_VERSION": "v2.1.0.2", - "RSTUDIO_VERSION": "2023.12.0+369", - "DEFAULT_USER": "rstudio", - "PANDOC_VERSION": "default", - "QUARTO_VERSION": "default" - }, - "RUN": [ - "/rocker_scripts/install_rstudio.sh", - "/rocker_scripts/install_pandoc.sh", - "/rocker_scripts/install_quarto.sh", - "/rocker_scripts/install_tidyverse.sh" - ], - "CMD": "[\"/init\"]", - "EXPOSE": 8787 - }, - { - "IMAGE": "ml-verse", - "tags": [ - "docker.io/rocker/ml-verse:4.4.0", - "ghcr.io/rocker-org/ml-verse:4.4.0", - "docker.io/rocker/ml-verse:4.4", - "ghcr.io/rocker-org/ml-verse:4.4", - "docker.io/rocker/ml-verse:4", - "ghcr.io/rocker-org/ml-verse:4", - "docker.io/rocker/ml-verse:latest", - "ghcr.io/rocker-org/ml-verse:latest" - ], - "labels": { - "org.opencontainers.image.title": "rocker/ml-verse", - "org.opencontainers.image.description": "Docker image with R + GPU support for machine learning libraries, and many R packages." - }, - "FROM": "rocker/ml:4.4.0", - "ENV": { - "CTAN_REPO": "https://mirror.ctan.org/systems/texlive/tlnet" - }, - "RUN": [ - "/rocker_scripts/install_verse.sh", - "/rocker_scripts/install_geospatial.sh" - ] - } - ] -} diff --git a/stacks/extra.json b/stacks/extra.json index e0711889..30245054 100644 --- a/stacks/extra.json +++ b/stacks/extra.json @@ -1,6 +1,6 @@ { "ordered": false, - "TAG": "4.4.0", + "TAG": "4.3.3", "LABEL": "org.opencontainers.image.licenses=\"GPL-2.0-or-later\" \\\n org.opencontainers.image.source=\"https://github.com/rocker-org/rocker-versioned2\" \\\n org.opencontainers.image.vendor=\"Rocker Project\" \\\n org.opencontainers.image.authors=\"Carl Boettiger \"", "group": [ { @@ -32,8 +32,8 @@ { "IMAGE": "geospatial-ubuntugis", "tags": [ - "docker.io/rocker/geospatial:4.4.0-ubuntugis", - "ghcr.io/rocker-org/geospatial:4.4.0-ubuntugis", + "docker.io/rocker/geospatial:4.3.3-ubuntugis", + "ghcr.io/rocker-org/geospatial:4.3.3-ubuntugis", "docker.io/rocker/geospatial:ubuntugis", "ghcr.io/rocker-org/geospatial:ubuntugis" ], @@ -41,7 +41,7 @@ "org.opencontainers.image.title": "rocker/geospatial on ubuntugis", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." }, - "FROM": "rocker/verse:4.4.0", + "FROM": "rocker/verse:4.3.3", "COPY": "scripts/experimental/install_geospatial_unstable.sh /rocker_scripts/experimental/install_geospatial_unstable.sh", "RUN": "/rocker_scripts/experimental/install_geospatial_unstable.sh", "cache-from": [ @@ -55,7 +55,7 @@ "org.opencontainers.image.title": "rocker/geospatial on dev-osgeo", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." }, - "FROM": "rocker/verse:4.4.0", + "FROM": "rocker/verse:4.3.3", "ENV": { "PROJ_VERSION": "9.4.0", "GDAL_VERSION": "3.8.5",