Keep the owner:group of the one downloading the tarball

In the scenario:
./configure --prefix=<something_which_needs_su/sudo>
make domserver <as unpriviliged user which downloaded the tarball>
sudo make-installdomserver <as root>

We would copy the Nelmiodoc files as root, so the user can't run a make
{dist}clean without errors as we can't remove the folder as its owned by
root.

See
DOMjudge#2303 (comment)
for the reasoning behind this.

So we replace phony copy-bundle-assets target by a real one. This makes that
we don't rerun the rule during `domserver-install` if it already ran during
`domserver`, so that if you install as root, the local files are still owned
by the user who first ran `make domserver`, not root.

This does assume that if the directory `public/bundles/nelmioapidoc`
exists, then it contains the assets, and these won't automatically
get updated, for example, in the setting of a maintainer-install so
there we always remove the directory and recreate it.

We now also install nelmiodoc together with composer in the base image
for CI:
- together with the needed dependencies
- make sure we get an autoload.php

Author: vmcj

.github/jobs/configure-checks/setup_configure_image.sh

@@ -10,12 +10,21 @@ case $distro_id in
         dnf install pkg-config make bats autoconf automake util-linux -y ;;
     *)
         apt-get update; apt-get full-upgrade -y
-        apt-get install pkg-config make bats autoconf -y ;;
+        apt-get install pkg-config make bats autoconf -y
+        apt-get install composer php php-cli php-curl php-fpm php-gd \
+                        php-intl php-json php-mbstring php-mysql php-xml php-zip -y ;;
 esac
 
 # Build the configure file
 make configure
 
+case $distro_id in
+    "ID=fedora")
+        true ;;
+    *)
+        composer install --no-scripts ;;
+esac
+
 # Install extra assert statements for bots
 cp submit/assert.bash .github/jobs/configure-checks/
 

webapp/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/Makefile.global
 # Subdirectories to recurse into for REC_TARGETS
 SUBDIRS = config
 
-domserver: composer-dump-autoload
+domserver: composer-dump-autoload public/bundles/nelmioapidoc
 
 # Install PHP dependencies
 composer-dependencies:
@@ -43,20 +43,19 @@ composer-dump-autoload-dev:
 	@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
 	@echo "APP_ENV=dev" >> $@
 
-copy-bundle-assets:
+public/bundles/nelmioapidoc:
 # We can not use bin/console here, as when using a fakeroot,
 # the include paths are broken. We just copy in the data we need
-	-rm -rf public/bundles/nelmioapidoc
-	mkdir -p public/bundles/nelmioapidoc
-	cp -R vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
+	mkdir -p $@
+	cp -a vendor/nelmio/api-doc-bundle/public/* $@
 
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
 	-rm -f vendor/autoload_runtime.php
 
+domserver-l: public/bundles/nelmioapidoc
+
 install-domserver:
-# This must be done first to install with the rest.
-	$(MAKE) copy-bundle-assets
 	$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
 	for d in bin config migrations public resources src templates tests vendor; do \
 		$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \
@@ -71,12 +70,16 @@ maintainer-conf: .env.local
 
 maintainer-install: composer-dump-autoload-dev
 
+maintainer-install-l:
+# This must be done first to install with the rest.
+	-rm -rf public/bundles/nelmioapidoc
+	$(MAKE) public/bundles/nelmioapidoc
+
 maintainer-clean-l:
 	-for d in cache log ; do \
 		for t in dev prod ; do \
 			rm -rf var/$$d/$$t ; \
 		done ; \
 	done
 
-.PHONY: composer-dump-autoload composer-dump-autoload-dev \
-        copy-bundle-assets
+.PHONY: composer-dump-autoload composer-dump-autoload-dev