Skip to content

Commit 73e8f41

Browse files
committed
tidy
1 parent 92438cd commit 73e8f41

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

inst/docker/gdal/Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN cd proj* \
104104

105105
# https://download.osgeo.org/gdal/3.1.0/gdal-3.1.0rc2.tar.gz
106106
ENV GDAL_VERSION 3.5.0
107-
ENV GDAL_VERSION_NAME 3.5.0alpha1
107+
ENV GDAL_VERSION_NAME 3.5.0rc1
108108

109109
RUN wget -q http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_NAME}.tar.gz \
110110
&& tar -xf gdal-${GDAL_VERSION_NAME}.tar.gz \
@@ -116,19 +116,6 @@ RUN wget -q http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION_N
116116
&& make install \
117117
&& ldconfig
118118

119-
#RUN git clone --depth 1 https://github.com/OSGeo/gdal.git
120-
#RUN cd gdal/gdal \
121-
# && ls -l \
122-
# && ./configure \
123-
# && make \
124-
# && make install \
125-
# && cd .. \
126-
# && ldconfig
127-
128-
# RUN svn checkout svn://scm.r-forge.r-project.org/svnroot/rgdal/
129-
# RUN R CMD build rgdal/pkg --no-build-vignettes
130-
# RUN R CMD INSTALL rgdal_*.tar.gz
131-
132119
RUN Rscript -e 'install.packages(c("sp", "rgeos", "rgdal", "RPostgreSQL", "RSQLite", "testthat", "knitr", "tidyr", "geosphere", "maptools", "maps", "microbenchmark", "raster", "dplyr", "tibble", "units", "DBI", "covr", "protolite", "tmap", "mapview", "odbc", "pool", "rmarkdown", "RPostgres","spatstat", "stars", "XML", "tmaptools", "tmap", "terra", "PCICt", "RNetCDF", "future.apply", "ggforce", "ggthemes", "gstat", "ncmeta", "pbapply", "plm", "spacetime", "xts", "zoo", "tidync", "ncdfgeom", "cubelyr", "clue"))'
133120

134121
RUN git clone --depth 10 https://github.com/r-spatial/sf.git
@@ -137,6 +124,7 @@ RUN git clone --depth 10 https://github.com/r-spatial/stars.git
137124
#RUN git config --global user.email "edzer.pebesma@uni-muenster.de"
138125

139126
RUN R CMD build --no-build-vignettes --no-manual lwgeom
127+
RUN Rscript -e 'install.packages(c("rmarkdown"))'
140128
RUN R CMD build --no-build-vignettes --no-manual sf
141129
# RUN pkg-config proj --modversion
142130
RUN Rscript -e 'install.packages(c("classInt"))'

0 commit comments

Comments
 (0)