rocky 8.5

#391

.devcontainer/compose.pro.yml

@@ -28,7 +28,7 @@ services:
     <<: [*all-alias, *bld-alias]
     build:
       context: .devcontainer
-      dockerfile: centos7-pro.dockerfile
+      dockerfile: rocky85-pro.dockerfile
       network: host
       args:
         <<: *all-build-args-alias

.devcontainer/denv.sh

@@ -9,8 +9,8 @@ if [ -z ${BPROTAG} ]; then
     BPROTAG=latest
   fi
 fi
-dkr="$(findVer 'FROM' .devcontainer/centos7-bld.dockerfile .devcontainer/centos7-pro.dockerfile)"
-dkr=$(eval echo ${dkr}) # ghcr.io/smanders/buildpro/centos7-[bld|pro]:TAG, where TAG=${BPROTAG}
+dkr="$(findVer 'FROM' .devcontainer/rocky85-bld.dockerfile .devcontainer/rocky85-pro.dockerfile)"
+dkr=$(eval echo ${dkr}) # ghcr.io/smanders/buildpro/rocky85-[bld|pro]:TAG, where TAG=${BPROTAG}
 hst=$(echo "${dkr}" | cut -d/ -f1) # ghcr.io
 rel=$(echo "${dkr}" | cut -d- -f2) # bld:TAG
 rel=${rel//:} # parameter expansion substitution
@@ -75,9 +75,9 @@ else
   env="${env}\nADDSRC2=_bld/*.sh"
 fi
 ##############################
-# NOTE: EXTERN_DIR and GCC_VER need to match buildpro's public/centos7-pro.dockerfile
+# NOTE: EXTERN_DIR and GCC_VER need to match buildpro's public/rocky85-pro.dockerfile
 EXTERN_DIR=/opt/extern
-GCC_VER=gcc931
+GCC_VER=gcc921
 ##############################
 wproVer="$(findVer 'set(webpro_REV' CMakeLists.txt */CMakeLists.txt */toplevel.cmake */*/toplevel.cmake */defaults.txt)"
 if [[ -n "${wproVer}" ]]; then
@@ -94,7 +94,7 @@ if [[ -n "${wproVer}" ]]; then
 && rm ${wproBase}.sh"
   elif ${doisrhub}; then
     WEBPRO_DL="wget ${urlPfx}/webpro/webpro/releases/download/${wproVer}/${wproBase}.tar.xz"
-    WEBPRO="${WEBPRO_DL} -qO- | tar -xJ -C ${EXTERN_DIR}"
+    WEBPRO="${WEBPRO_DL} -qO- | tar --no-same-owner -xJ -C ${EXTERN_DIR}"
   fi
 fi
 env="${env}\nWEBPRO=${WEBPRO}"
@@ -103,7 +103,7 @@ env="${env}\nWEBPRO=${WEBPRO}"
 iproVer="$(findVer 'set(internpro_REV' CMakeLists.txt */toplevel.cmake */*/toplevel.cmake */defaults.txt)"
 if [[ -n "${iproVer}" ]] && ${doisrhub}; then
   INTERNPRO_DL="wget ${urlPfx}/internpro/internpro/releases/download/${iproVer}/internpro-${iproVer}-${GCC_VER}-64-$(uname -s).tar.xz"
-  INTERNPRO="${INTERNPRO_DL} -qO- | tar -xJ -C ${EXTERN_DIR}"
+  INTERNPRO="${INTERNPRO_DL} -qO- | tar --no-same-owner -xJ -C ${EXTERN_DIR}"
 fi
 env="${env}\nINTERNPRO=${INTERNPRO}"
 [[ -n ${INTERNPRO_DL} ]] && cr8="${cr8}\n${INTERNPRO_DL}"
@@ -116,7 +116,7 @@ else
 fi
 if [[ -n "${psdkVer}" ]] && ${doisrhub}; then
   PLUGINSDK_DL="wget ${urlPfx}/PluginFramework/SDKSuper/releases/download/${psdkVer}/${pfx}PluginSDK-${psdkVer}-${GCC_VER}-64-$(uname -s).tar.xz"
-  PLUGINSDK="${PLUGINSDK_DL} -qO- | tar -xJ -C ${EXTERN_DIR}"
+  PLUGINSDK="${PLUGINSDK_DL} -qO- | tar --no-same-owner -xJ -C ${EXTERN_DIR}"
 fi
 env="${env}\nPLUGINSDK=${PLUGINSDK}"
 [[ -n ${PLUGINSDK_DL} ]] && cr8="${cr8}\n${PLUGINSDK_DL}"

.devcontainer/centos7-pro.dockerfile → .devcontainer/rocky85-pro.dockerfile

@@ -1,5 +1,5 @@
 ARG BPROTAG
-FROM ghcr.io/smanders/buildpro/centos7-pro:${BPROTAG}
+FROM ghcr.io/smanders/buildpro/rocky85-pro:${BPROTAG}
 LABEL maintainer="smanders"
 LABEL org.opencontainers.image.source https://github.com/smanders/buildpro
 SHELL ["/bin/bash", "-c"]

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.24)
 project(externpro)
-set(buildpro_REV 23.03.2)
+set(buildpro_REV 23.04.1)
 set(XP_DOWNLOAD_URL "https://github.com/smanders/externpro/releases/download")
 set(XP_INSTALL_INFO "Installers located at https://github.com/smanders/externpro/releases")
 set(XP_AUTO_INCLUDE xpfunmac)