Skip to content

Commit 6016114

Browse files
RobinlovelaceRobinlovelace
committed
Remove mamba images
1 parent 18062a5 commit 6016114

File tree

7 files changed

+48
-81
lines changed

7 files changed

+48
-81
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ jobs:
3737
dockerfile: rust/Dockerfile
3838
- image: buildbook
3939
dockerfile: buildbook/Dockerfile
40-
- image: mamba-py
41-
dockerfile: mamba-py/Dockerfile
42-
- image: mamba-pyr
43-
dockerfile: mamba-pyr/Dockerfile
4440
- image: python
4541
dockerfile: python/Dockerfile
4642
- image: pythonr

‎README.Rmd‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,35 +87,19 @@ The default is the `latest` tag, representing the `Dockerfile` in the root of th
8787

8888
Building on the [rocker-org](https://github.com/rocker-org/rocker-versioned/blob/master/README.md) project, we provide various versions for testing and development, including builds that use more up-to-date versions of OSGeo packages such as GDAL provided by the [UbuntuGIS software repository](https://wiki.ubuntu.com/UbuntuGIS), as shown below:
8989

90-
image | description | size
91-
---------------- | ----------------------------------------- | ------
92-
[latest](https://github.com/geocompx/docker/pkgs/container/docker/) | docker pull ghcr.io/geocompx/latest image + book files | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=latest)
93-
[minimal](https://github.com/geocompx/docker/blob/master/minimal) | docker pull ghcr.io/geocompx/minimal rocker/geospatial plus geocompkg Imports | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=minimal)
94-
[suggests](https://github.com/geocompx/docker/blob/master/suggests) | docker pull ghcr.io/geocompx/suggests includes all packages from geocompkgs (Suggests) | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=suggests)
95-
[binder](https://github.com/geocompx/docker/blob/master/binder) | docker pull ghcr.io/geocompx/binder runs with Binder | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=binder)
96-
[osgeo](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/osgeo running on rocker/geospatial:osgeo | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=osgeo)
97-
[buildbook](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/buildbook runs the book code | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=buildbook)
98-
[qgis](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/qgis with QGIS | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=qgis)
99-
[rocker-rpy](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rocker-rpy with python | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=rocker-rpy)
100-
[rocker-rpyjl](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rocker-rpyjl with R, Python, and Julia | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=rocker-rpyjl)
101-
[python](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/python Python image + geo pkgs | ![]( )
102-
[rust](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rust with Rust | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=rust)
103-
[mamba-py](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/mamba-py | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=mamba-py)
104-
[mamba-pyr](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/mamba-pyr | ![](https://ghcr-badge.egpl.dev/geocompx/docker/size?tag=mamba-pyr)
105-
<!-- Shields endpoint badges (generated by workflow to gh-pages) -->
106-
<!-- Example: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/<owner>/<repo>/gh-pages/badges/<image>-size.json -->
107-
<!-- Replace the ghcr-badge links with the following once the workflow runs -->
108-
[latest](https://github.com/geocompx/docker/pkgs/container/docker/) | docker pull ghcr.io/geocompx/latest image + book files | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/latest-size.json)
109-
[minimal](https://github.com/geocompx/docker/blob/master/minimal) | docker pull ghcr.io/geocompx/minimal rocker/geospatial plus geocompkg Imports | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/minimal-size.json)
110-
[suggests](https://github.com/geocompx/docker/blob/master/suggests) | docker pull ghcr.io/geocompx/suggests includes all packages from geocompkgs (Suggests) | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/suggests-size.json)
111-
[binder](https://github.com/geocompx/docker/blob/master/binder) | docker pull ghcr.io/geocompx/binder runs with Binder | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/binder-size.json)
112-
[osgeo](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/osgeo running on rocker/geospatial:osgeo | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/osgeo-size.json)
113-
[buildbook](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/buildbook runs the book code | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/buildbook-size.json)
114-
[qgis](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/qgis with QGIS | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/qgis-size.json)
115-
[rocker-rpy](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rocker-rpy with python | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/rocker-rpy-size.json)
116-
[rocker-rpyjl](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rocker-rpyjl with R, Python, and Julia | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/rocker-rpyjl-size.json)
117-
[python](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/python Python image + geo pkgs | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/python-size.json)
118-
[rust](https://github.com/geocompx/docker/blob/master/) | docker pull ghcr.io/geocompx/rust with Rust | ![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/geocompx/docker/gh-pages/badges/rust-size.json)
90+
```{r, include=FALSE}
91+
imgs = readr::read_csv("image-info.csv")
92+
urls = paste0("https://ghcr.io/geocompx/", imgs$image_name, ":latest")
93+
imgs[[1]] = paste0("[", imgs[[1]], "](", urls, ")")
94+
source_code_urls = paste0("https://github.com/geocompx/geocompr/blob/master/", imgs$source_code)
95+
imgs[[2]] = paste0("[", imgs[[2]], "](", source_code_urls, ")")
96+
names(imgs) = c("Image", "Command", "Size")
97+
```
98+
99+
```{r, echo=FALSE}
100+
knitr::kable(imgs)
101+
```
102+
119103

120104
The base image is `rocker/geospatial` from [github.com/rocker-org/rocker-versioned2](https://github.com/rocker-org/rocker-versioned2).
121105

‎image-info.csv‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
image_name,description,size
2-
binder,"docker pull ghcr.io/geocompx/binder runs with Binder",6.74GB
3-
buildbook,"docker pull ghcr.io/geocompx/buildbook runs the book code",6.44GB
4-
geocompy,"docker pull ghcr.io/geocompx/latest image + book files",5.09GB
5-
mamba-py,"docker pull ghcr.io/geocompx/mamba-py",4.01GB
2+
binder,"docker pull ghcr.io/geocompx/binder",6.74GB
3+
buildbook,"docker pull ghcr.io/geocompx/buildbook",6.44GB
4+
geocompy,"docker pull ghcr.io/geocompx/latest",5.09GB
5+
minimal,"docker pull ghcr.io/geocompx/minimal",5.43GB
6+
osgeo,"docker pull ghcr.io/geocompx/osgeo",6.07GB
7+
python,"docker pull ghcr.io/geocompx/python",2.32GB
8+
pythonr,"docker pull ghcr.io/geocompx/pythonr",4.37GB
9+
qgis,"docker pull ghcr.io/geocompx/qgis",8.63GB
10+
rocker-rpy,"docker pull ghcr.io/geocompx/rocker-rpy",6.46GB
11+
rocker-rpyjl,"docker pull ghcr.io/geocompx/rocker-rpyjl",7.68GB
12+
rust,"docker pull ghcr.io/geocompx/rust",7.63GB
13+
suggests,"docker pull ghcr.io/geocompx/suggests",5.67GB
14+
unzipped,"docker pull ghcr.io/geocompx/unzipped",4.98GB

‎mamba-py/Dockerfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎mamba-pyr/Dockerfile‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pythonr/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ RUN mkdir -p /etc/R && \
2424
RUN R -e "install.packages('pak')"
2525

2626
# # Install packages with pak (binaries from RSPM)
27-
RUN Rscript -e "pak::pkg_install('sf')"
27+
RUN Rscript -e "pak::pkg('sf')"
2828

2929
RUN R -e "install.packages('geocompkg', repos = c('https://geocompx.r-universe.dev', 'https://packagemanager.posit.co/cran/__linux__/bookworm/latest'), dependencies = TRUE, force = TRUE)"
3030

31-
# # build the book
32-
# RUN wget https://github.com/geocompx/geocompr/archive/main.zip && \
33-
# unzip main.zip && \
34-
# mv geocompr-main geocompr && \
35-
# rm main.zip
36-
# RUN Rscript -e 'bookdown::render_book("geocompr", output_format = "bookdown::gitbook", clean = FALSE)'
31+
# build the book
32+
RUN wget https://github.com/geocompx/geocompr/archive/main.zip && \
33+
unzip main.zip && \
34+
mv geocompr-main geocompr && \
35+
rm main.zip
36+
RUN Rscript -e 'bookdown::render_book("geocompr", output_format = "bookdown::gitbook", clean = FALSE)'

‎scripts/get-image-info.sh‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,24 @@ echo "image_name,description,size" > "$csv_file"
88

99
# Descriptions from the markdown table in README.Rmd
1010
declare -A descriptions=(
11-
["latest"]="docker pull ghcr.io/geocompx/latest image + book files"
12-
["minimal"]="docker pull ghcr.io/geocompx/minimal rocker/geospatial plus geocompkg Imports"
13-
["suggests"]="docker pull ghcr.io/geocompx/suggests includes all packages from geocompkgs (Suggests)"
14-
["binder"]="docker pull ghcr.io/geocompx/binder runs with Binder"
15-
["osgeo"]="docker pull ghcr.io/geocompx/osgeo running on rocker/geospatial:osgeo"
16-
["buildbook"]="docker pull ghcr.io/geocompx/buildbook runs the book code"
17-
["qgis"]="docker pull ghcr.io/geocompx/qgis with QGIS"
18-
["rocker-rpy"]="docker pull ghcr.io/geocompx/rocker-rpy with python"
19-
["rocker-rpyjl"]="docker pull ghcr.io/geocompx/rocker-rpyjl with R, Python, and Julia"
20-
["python"]="docker pull ghcr.io/geocompx/python Python image + geo pkgs"
21-
["rust"]="docker pull ghcr.io/geocompx/rust with Rust"
22-
["mamba-py"]="docker pull ghcr.io/geocompx/mamba-py"
23-
["mamba-pyr"]="docker pull ghcr.io/geocompx/mamba-pyr"
24-
["pythonr"]="docker pull ghcr.io/geocompx/pythonr Python and R image + geo pkgs"
25-
["geocompy"]="docker pull ghcr.io/geocompx/latest image + book files"
26-
["unzipped"]="docker pull ghcr.io/geocompx/unzipped rocker/geospatial with geocompr book unzipped"
11+
["latest"]="docker pull ghcr.io/geocompx/latest"
12+
["minimal"]="docker pull ghcr.io/geocompx/minimal"
13+
["suggests"]="docker pull ghcr.io/geocompx/suggests"
14+
["binder"]="docker pull ghcr.io/geocompx/binder"
15+
["osgeo"]="docker pull ghcr.io/geocompx/osgeo"
16+
["buildbook"]="docker pull ghcr.io/geocompx/buildbook"
17+
["qgis"]="docker pull ghcr.io/geocompx/qgis"
18+
["rocker-rpy"]="docker pull ghcr.io/geocompx/rocker-rpy"
19+
["rocker-rpyjl"]="docker pull ghcr.io/geocompx/rocker-rpyjl"
20+
["python"]="docker pull ghcr.io/geocompx/python"
21+
["rust"]="docker pull ghcr.io/geocompx/rust"
22+
["pythonr"]="docker pull ghcr.io/geocompx/pythonr"
23+
["geocompy"]="docker pull ghcr.io/geocompx/latest"
24+
["unzipped"]="docker pull ghcr.io/geocompx/unzipped"
2725
)
2826

2927
# List of packages from the original script
30-
packages=("binder" "buildbook" "geocompy" "mamba-py" "mamba-pyr" "minimal" "osgeo" "python" "pythonr" "qgis" "rocker-rpy" "rocker-rpyjl" "rust" "suggests" "unzipped")
28+
packages=("binder" "buildbook" "geocompy" "minimal" "osgeo" "python" "pythonr" "qgis" "rocker-rpy" "rocker-rpyjl" "rust" "suggests" "unzipped")
3129

3230
for pkg in "${packages[@]}"; do
3331
if [[ -n "${descriptions[$pkg]}" ]]; then

0 commit comments

Comments
 (0)