dockersrc/almalinux
1
0
Fork 0
mirror of https://github.com/dockersrc/almalinux synced 2026-06-30 17:45:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔧 Fix Dockerfile names, PHP version, and CRB repo handling 🔧

Browse Source 
- Correct ENV_DOCKERFILE references from double-versioned names (8.8-dev, 9.9-dev) to canonical names (8-dev, 9-dev)
- Set PHP_VERSION to 7.4 instead of system default in both 8-dev and 9-dev env scripts
- Rename CRB repo paths and labels to PowerTools equivalents after fetching repo files in Dockerfile.8-dev

Dockerfile.8-dev
.env.scripts.8-dev
.env.scripts.9-dev
This commit is contained in:
Jason Hempstead
2026-05-04 12:51:15 -04:00
parent c78eb85c46
commit 12c96925ef
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.scripts.8-dev
+2 -2
View File
@@ -15,7 +15,7 @@ DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS"
DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS" DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Dockerfile info # Dockerfile info
ENV_DOCKERFILE="Dockerfile.8.8-dev" ENV_DOCKERFILE="Dockerfile.8-dev"
ENV_IMAGE_NAME="almalinux" ENV_IMAGE_NAME="almalinux"
ENV_USE_TEMPLATE="almalinux" ENV_USE_TEMPLATE="almalinux"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -45,7 +45,7 @@ SERVICE_PORT=""
EXPOSE_PORTS="" EXPOSE_PORTS=""
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Versions # Versions
PHP_VERSION="system" PHP_VERSION="7.4"
NODE_VERSION="system" NODE_VERSION="system"
NODE_MANAGER="system" NODE_MANAGER="system"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
.env.scripts.9-dev
+2 -2
View File
@@ -15,7 +15,7 @@ DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS"
DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS" DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Dockerfile info # Dockerfile info
ENV_DOCKERFILE="Dockerfile.9.9-dev" ENV_DOCKERFILE="Dockerfile.9-dev"
ENV_IMAGE_NAME="almalinux" ENV_IMAGE_NAME="almalinux"
ENV_USE_TEMPLATE="almalinux" ENV_USE_TEMPLATE="almalinux"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -45,7 +45,7 @@ SERVICE_PORT=""
EXPOSE_PORTS="" EXPOSE_PORTS=""
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Versions # Versions
PHP_VERSION="system" PHP_VERSION="7.4"
NODE_VERSION="system" NODE_VERSION="system"
NODE_MANAGER="system" NODE_MANAGER="system"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Dockerfile.8-dev
+1
View File
@@ -115,6 +115,7 @@ RUN echo "Setting up dev system"; \
if [ -f "/usr/local/bin/pkmgr" ] ; then rm -Rf "/usr/local/bin/pkmgr"; fi; \ 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; \ 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")"; \ 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; \ rm -f /etc/yum.repos.d/*crb*.repo 2>/dev/null || true; \
dnf clean all 2>/dev/null || true; \ dnf clean all 2>/dev/null || true; \
[ ! -d "/usr/local/share/CasjaysDev/scripts" ] && \ [ ! -d "/usr/local/share/CasjaysDev/scripts" ] && \