docker: install ccache+rsync early

Hoist the installation of ccache and rsync into one of the early blocks in all images. This ensures that the ccache binary is available for everything built.
OSGeo-jp · Oct 9, 2024 · dfef18d · dfef18d
1 parent a9a0793
commit dfef18d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile
@@ -82,6 +82,7 @@ RUN apk add --no-cache \
     py3-setuptools \
     python3-dev \
     qhull-dev \
+    rsync \
     sfcgal-dev \
     snappy-dev \
     sqlite-dev \
@@ -140,7 +141,6 @@ RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     && rm -rf libOpenDRIVE-${OPENDRIVE_VERSION} \
     ); fi
 
-RUN apk add --no-cache rsync ccache
 ARG RSYNC_REMOTE
 ARG WITH_CCACHE
 

diff --git a/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile
@@ -20,11 +20,15 @@ RUN apk add --no-cache wget curl unzip make libtool autoconf automake pkgconfig
 
 # For PROJ and GDAL
 RUN apk add --no-cache \
+    ccache \
     cmake ninja-build \
     linux-headers \
     curl-dev tiff-dev \
     zlib-dev zstd-dev lz4-dev libdeflate-dev libarchive-dev \
-    libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev postgresql-dev openjpeg-dev
+    libjpeg-turbo-dev libpng-dev libwebp-dev expat-dev \
+    postgresql-dev \
+    rsync \
+    openjpeg-dev
 
 # Ninja is not in the default path on Alpine.
 ENV PATH=/usr/lib/ninja-build/bin:$PATH
@@ -47,8 +51,6 @@ RUN if test "${OPENJPEG_VERSION}" != ""; then ( \
     && rm -rf openjpeg-${OPENJPEG_VERSION} \
     ); fi
 
-RUN apk add --no-cache rsync ccache
-
 ARG PROJ_DATUMGRID_LATEST_LAST_MODIFIED
 RUN \
     mkdir -p /build_projgrids/usr/share/proj \

diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
@@ -44,10 +44,11 @@ USER root
 RUN . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
-            build-essential ca-certificates \
+            build-essential ca-certificates ccache\
             git make ninja-build cmake wget unzip libtool automake \
             zlib1g-dev${APT_ARCH_SUFFIX} libsqlite3-dev${APT_ARCH_SUFFIX} pkg-config sqlite3 libcurl4-openssl-dev${APT_ARCH_SUFFIX} \
             libtiff-dev${APT_ARCH_SUFFIX} \
+            rsync \
     && rm -rf /var/lib/apt/lists/*
 
 ARG JAVA_VERSION=17
@@ -275,9 +276,6 @@ RUN . /buildscripts/bh-set-envvars.sh \
     && rm -rf /var/lib/apt/lists/* \
     && rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
 
-RUN apt-get update -y \
-    && apt-get install -y --fix-missing --no-install-recommends rsync ccache \
-    && rm -rf /var/lib/apt/lists/*
 ARG RSYNC_REMOTE
 ARG WITH_CCACHE
 

diff --git a/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile
@@ -45,10 +45,11 @@ USER root
 RUN . /buildscripts/bh-set-envvars.sh \
     && apt-get update -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing --no-install-recommends \
-            build-essential ca-certificates \
+            build-essential ca-certificates ccache \
             git make ninja-build cmake wget unzip libtool automake \
             zlib1g-dev${APT_ARCH_SUFFIX} libsqlite3-dev${APT_ARCH_SUFFIX} pkg-config sqlite3 libcurl4-openssl-dev${APT_ARCH_SUFFIX} \
             libtiff-dev${APT_ARCH_SUFFIX} \
+            rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # Setup build env for GDAL
@@ -93,9 +94,6 @@ RUN \
     && unzip -q -j -u -o proj-datumgrid-latest.zip  -d /build_projgrids/${PROJ_INSTALL_PREFIX}/share/proj \
     && rm -f *.zip
 
-RUN apt-get update -y \
-    && apt-get install -y --fix-missing --no-install-recommends rsync ccache \
-    && rm -rf /var/lib/apt/lists/*
 ARG RSYNC_REMOTE
 ARG WITH_CCACHE