Move MARKETPLACE_DIR into Dockerfile so 10.x is supported

Author: froozeify

.github/workflows/glpi.yml

@@ -97,7 +97,6 @@ jobs:
     name: "Prepare"
     runs-on: "ubuntu-latest"
     outputs:
-      marketplace-dir: ${{ steps.set-vars.outputs.marketplace_dir }}
       artifact-prefix: ${{ steps.set-vars.outputs.artifact_prefix }}
       is-latest: ${{ steps.set-vars.outputs.is_latest }}
       is-latest-major: ${{ steps.set-vars.outputs.is_latest_major }}
@@ -147,15 +146,6 @@ jobs:
           fi
           echo "cache_key=$CACHE_KEY" >> $GITHUB_OUTPUT
 
-          # Compute marketplace dir (only v10 uses old path)
-          MARKETPLACE_DIR="/var/glpi/marketplace"
-          if [[ "$IS_SEMVER" = "true" ]]; then
-            IMAGE_VERSION_MAJOR=$(echo "$GLPI_VERSION" | cut --delimiter=. --fields=1)
-            if [[ "$IMAGE_VERSION_MAJOR" = "10" ]]; then
-              MARKETPLACE_DIR="/var/www/glpi/marketplace"
-            fi
-          fi
-          echo "marketplace_dir=$MARKETPLACE_DIR" >> $GITHUB_OUTPUT
 
           # Compute artifact prefix (unique per workflow call)
           if [[ "$IMAGE_TAG" != '' ]]; then
@@ -269,7 +259,6 @@ jobs:
             GLPI_CACHE_KEY=${{ needs.prepare.outputs.cache-key }}
             BUILDER_IMAGE=php:${{ needs.prepare.outputs.php-version }}-cli-alpine
             APP_IMAGE=php:${{ needs.prepare.outputs.php-version }}-apache
-            GLPI_MARKETPLACE_DIR=${{ needs.prepare.outputs.marketplace-dir }}
           cache-from: |
             type=gha,scope=${{ needs.prepare.outputs.cache-key }}-${{ matrix.platform.suffix }}
             type=gha,scope=main-${{ matrix.platform.suffix }}

glpi/Dockerfile

@@ -106,7 +106,6 @@ RUN /usr/src/glpi/tools/build_glpi.sh
 #####
 FROM $APP_IMAGE
 
-ARG GLPI_MARKETPLACE_DIR=/var/glpi/marketplace
 
 LABEL \
   org.opencontainers.image.title="GLPI nightly build" \
@@ -209,15 +208,27 @@ RUN a2enconf zzz-glpi.conf
 # Copy GLPI application.
 COPY --from=builder --chown=www-data:www-data /usr/src/glpi /var/www/glpi
 
+# Detect GLPI major version from version/ folder and set marketplace directory
+# v10.x uses /var/www/glpi/marketplace, v11+ uses /var/glpi/marketplace
+RUN GLPI_VERSION_FILE=$(ls /var/www/glpi/version/ | sort --version-sort | tail --lines=1); \
+    GLPI_MAJOR=$(echo "$GLPI_VERSION_FILE" | cut --delimiter='.' --fields=1); \
+    if [ "$GLPI_MAJOR" = "10" ]; then \
+      MARKETPLACE_DIR="/var/www/glpi/marketplace"; \
+    else \
+      MARKETPLACE_DIR="/var/glpi/marketplace"; \
+    fi; \
+    echo "GLPI_MARKETPLACE_DIR=$MARKETPLACE_DIR" >> /etc/glpi_env
+
 # Declare a volume for "config", "marketplace" and "files" directory
 RUN mkdir /var/glpi && chown www-data:www-data /var/glpi
 VOLUME /var/glpi
 
 # Define GLPI environment variables
+# Note: GLPI_MARKETPLACE_DIR is sourced from /etc/glpi_env at container startup
+# We cannot dynamically set an ENV value based on the output of a RUN command
 ENV \
   GLPI_INSTALL_MODE=DOCKER \
   GLPI_CONFIG_DIR=/var/glpi/config \
-  GLPI_MARKETPLACE_DIR=${GLPI_MARKETPLACE_DIR} \
   GLPI_VAR_DIR=/var/glpi/files \
   GLPI_LOG_DIR=/var/glpi/logs \
   GLPI_SKIP_AUTOINSTALL=false \

glpi/files/opt/glpi/entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e -u -o pipefail
 
+# Source GLPI environment variables (includes GLPI_MARKETPLACE_DIR detected at build time)
+if [ -f /etc/glpi_env ]; then
+  export $(cat /etc/glpi_env | xargs)
+fi
+
 /opt/glpi/entrypoint/init-volumes-directories.sh
 /opt/glpi/entrypoint/forward-logs.sh
 /opt/glpi/entrypoint/wait-for-db.sh entrypoint