diff --git a/.env.scripts.8-dev b/.env.scripts.8-dev index e53fbd8..c1e0caf 100644 --- a/.env.scripts.8-dev +++ b/.env.scripts.8-dev @@ -15,7 +15,7 @@ DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS" DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Dockerfile info -ENV_DOCKERFILE="Dockerfile.8.8-dev" +ENV_DOCKERFILE="Dockerfile.8-dev" ENV_IMAGE_NAME="almalinux" ENV_USE_TEMPLATE="almalinux" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -45,7 +45,7 @@ SERVICE_PORT="" EXPOSE_PORTS="" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Versions -PHP_VERSION="system" +PHP_VERSION="7.4" NODE_VERSION="system" NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.env.scripts.9-dev b/.env.scripts.9-dev index 9a50630..6d56c9b 100644 --- a/.env.scripts.9-dev +++ b/.env.scripts.9-dev @@ -15,7 +15,7 @@ DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS" DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Dockerfile info -ENV_DOCKERFILE="Dockerfile.9.9-dev" +ENV_DOCKERFILE="Dockerfile.9-dev" ENV_IMAGE_NAME="almalinux" ENV_USE_TEMPLATE="almalinux" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -45,7 +45,7 @@ SERVICE_PORT="" EXPOSE_PORTS="" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Versions -PHP_VERSION="system" +PHP_VERSION="7.4" NODE_VERSION="system" NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile.8-dev b/Dockerfile.8-dev index 4d6d74b..9f8c04a 100644 --- a/Dockerfile.8-dev +++ b/Dockerfile.8-dev @@ -115,6 +115,7 @@ RUN echo "Setting up dev system"; \ if [ -f "/usr/local/bin/pkmgr" ] ; then rm -Rf "/usr/local/bin/pkmgr"; fi; \ rm -f /etc/yum.repos.d/*crb*.repo 2>/dev/null || true; \ bash -c "$(curl -q -LSsf "https://github.com/casjay-base/centos/raw/main/root/.local/bin/fetch-repo-file")"; \ + sed -i 's|/crb|/powertools|Ig; s|\[casjay-os-crb\]|[casjay-os-powertools]|g; s|AlmaLinux CRB|AlmaLinux PowerTools|g' /etc/yum.repos.d/*.repo 2>/dev/null || true; \ rm -f /etc/yum.repos.d/*crb*.repo 2>/dev/null || true; \ dnf clean all 2>/dev/null || true; \ [ ! -d "/usr/local/share/CasjaysDev/scripts" ] && \