Set default for MW_INSTALL_PATH and pass it along

See failures: SemanticMediaWiki/SemanticResultFormats#692
hexmode · May 4, 2024 · 7a69adc · 7a69adc
1 parent b30a427
commit 7a69adc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,9 +3,11 @@ ARG PHP_VERSION
 FROM gesinn/mediawiki-ci:${MW_VERSION}-php${PHP_VERSION}
 
 ARG EXTENSION
+ARG MW_INSTALL_PATH
 ARG MW_VERSION
 ARG PHP_VERSION
 ENV EXTENSION=${EXTENSION}
+ENV MW_INSTALL_PATH=${MW_INSTALL_PATH}
 
 # get needed dependencies for this extension
 RUN sed -i s/80/8080/g /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
@@ -111,4 +113,4 @@ COPY *__setup_extension__ setup_extension
 
 RUN if [ -f setup_extension ]; then \
         cat setup_extension >> __setup_extension__; \
-    fi
+    fi
diff --git a/Makefile b/Makefile
@@ -9,27 +9,29 @@ IMAGE_NAME := $(extension):test-$(MW_VERSION)-$(SMW_VERSION) # ggf hier Timestam
 # ======== CI ENV Variables ========
 DB_TYPE ?= sqlite
 DB_IMAGE ?= ""
+MW_INSTALL_PATH ?= /var/www/html
 
-
-environment = IMAGE_NAME=$(IMAGE_NAME) \
-EXTENSION=$(EXTENSION)  \
-NODE_JS=$(NODE_JS)  \
+environment = \
+AL_VERSION=$(AL_VERSION) \
+CHAMELEON_VERSION=$(CHAMELEON_VERSION) \
 COMPOSER_EXT=$(COMPOSER_EXT) \
+DB_IMAGE=$(DB_IMAGE) \
+DB_TYPE=$(DB_TYPE) \
+DT_VERSION=$(DT_VERSION) \
+EXTENSION=$(EXTENSION)  \
+EXTENSION_FOLDER=$(EXTENSION_FOLDER) \
+IMAGE_NAME=$(IMAGE_NAME) \
+MAPS_VERSION=$(MAPS_VERSION) \
+MM_VERSION=$(MM_VERSION) \
+MW_INSTALL_PATH=$(MW_INSTALL_PATH) \
 MW_VERSION=$(MW_VERSION)  \
-SMW_VERSION=$(SMW_VERSION) \
-PHP_VERSION=$(PHP_VERSION) \
-PF_VERSION=$(PF_VERSION) \
+NODE_JS=$(NODE_JS)  \
 PF_REPO=$(PF_REPO) \
+PF_VERSION=$(PF_VERSION) \
+PHP_VERSION=$(PHP_VERSION) \
 PS_VERSION=$(PS_VERSION) \
-DT_VERSION=$(DT_VERSION) \
-AL_VERSION=$(AL_VERSION) \
-MAPS_VERSION=$(MAPS_VERSION) \
+SMW_VERSION=$(SMW_VERSION) \
 SRF_VERSION=$(SRF_VERSION) \
-MM_VERSION=$(MM_VERSION) \
-CHAMELEON_VERSION=$(CHAMELEON_VERSION) \
-DB_TYPE=$(DB_TYPE) \
-DB_IMAGE=$(DB_IMAGE) \
-EXTENSION_FOLDER=$(EXTENSION_FOLDER)
 
 
 ifneq (,$(wildcard ./build/docker-compose.override.yml))
@@ -87,7 +89,7 @@ bash: .bash
 	$(compose-exec-wiki) bash -c "sudo -u www-data \
 		php maintenance/install.php \
 		    --pass=wiki4everyone --server=http://localhost:8080 --scriptpath='' \
-    		--dbname=wiki --dbuser=wiki --dbpass=wiki $(WIKI_DB_CONFIG) wiki WikiSysop && \
+		    --dbname=wiki --dbuser=wiki --dbpass=wiki $(WIKI_DB_CONFIG) wiki WikiSysop && \
 		cat __setup_extension__ >> LocalSettings.php && \
 		sudo -u www-data php maintenance/update.php --skip-external-dependencies --quick \
 		"
@@ -185,4 +187,4 @@ ifeq ($(DB_TYPE), mysql)
 	$(compose-run) wait-for $(DB_TYPE):3306 -t 120
 else ifeq ($(DB_TYPE), postgres)
 	$(compose-run) wait-for $(DB_TYPE):5432 -t 120
-endif
+endif
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,21 +4,22 @@ services:
       context: ../
       dockerfile: build/Dockerfile
       args:
-        EXTENSION: ${EXTENSION}
+        AL_VERSION: ${AL_VERSION}
+        CHAMELEON_VERSION: ${CHAMELEON_VERSION}
         COMPOSER_EXT: ${COMPOSER_EXT}
-        NODE_JS: ${NODE_JS}
+        DT_VERSION: ${DT_VERSION}
+        EXTENSION: ${EXTENSION}
+        MAPS_VERSION: ${MAPS_VERSION}
+        MM_VERSION: ${MM_VERSION}
+        MW_INSTALL_PATH: ${MW_INSTALL_PATH}
         MW_VERSION: ${MW_VERSION}
-        SMW_VERSION: ${SMW_VERSION}
-        PHP_VERSION: ${PHP_VERSION}
-        PF_VERSION: ${PF_VERSION}
+        NODE_JS: ${NODE_JS}
         PF_REPO: ${PF_REPO}
+        PF_VERSION: ${PF_VERSION}
+        PHP_VERSION: ${PHP_VERSION}
         PS_VERSION: ${PS_VERSION}
-        DT_VERSION: ${DT_VERSION}
-        AL_VERSION: ${AL_VERSION}
-        MAPS_VERSION: ${MAPS_VERSION}
+        SMW_VERSION: ${SMW_VERSION}
         SRF_VERSION: ${SRF_VERSION}
-        MM_VERSION: ${MM_VERSION}
-        CHAMELEON_VERSION: ${CHAMELEON_VERSION}
     image: ${IMAGE_NAME}
 
   mysql: