Skip to content

Commit 465e07b

Browse files
vmcjMichael Vasseur
authored and
Michael Vasseur
committed
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. 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 See #2303 (comment) for the reasoning behind this. Also fix the maintainer-install option, make would not run if the directory already exists so we would only get to this step if the directory is not there, so removing it would always be a NO-OP.
1 parent 9da8108 commit 465e07b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ case $distro_id in
1212
apt-get update; apt-get full-upgrade -y
1313
apt-get install pkg-config make bats autoconf -y
1414
apt-get install composer php php-cli php-curl php-fpm php-gd \
15-
php-intl php-json php-mbstring php-mysql php-xml php-zip -y
16-
;;
15+
php-intl php-json php-mbstring php-mysql php-xml php-zip -y ;;
1716
esac
1817

1918
# Build the configure file

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif
4848
domserver: domserver-configure paths.mk config
4949
judgehost: judgehost-configure paths.mk config
5050
docs: paths.mk config
51-
nstall-domserver: composer-dump-autoload domserver domserver-create-dirs
51+
install-domserver: domserver domserver-create-dirs
5252
install-judgehost: judgehost judgehost-create-dirs
5353
install-docs: docs-create-dirs
5454
dist: configure composer-dependencies

webapp/Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include $(TOPDIR)/Makefile.global
99
# Subdirectories to recurse into for REC_TARGETS
1010
SUBDIRS = config
1111

12-
domserver: composer-dump-autoload
12+
domserver: composer-dump-autoload public/bundles/nelmioapidoc
1313

1414
# Install PHP dependencies
1515
composer-dependencies:
@@ -46,7 +46,6 @@ composer-dump-autoload-dev:
4646
public/bundles/nelmioapidoc:
4747
# We can not use bin/console here, as when using a fakeroot,
4848
# the include paths are broken. We just copy in the data we need
49-
-rm -rf $@
5049
mkdir -p $@
5150
cp -a vendor/nelmio/api-doc-bundle/public/* $@
5251

@@ -79,11 +78,16 @@ maintainer-conf: .env.local
7978

8079
maintainer-install: composer-dump-autoload-dev
8180

81+
maintainer-install-l:
82+
# This must be done first to install with the rest.
83+
-rm -rf public/bundles/nelmioapidoc
84+
$(MAKE) public/bundles/nelmioapidoc
85+
8286
maintainer-clean-l:
8387
-for d in cache log ; do \
8488
for t in dev prod ; do \
8589
rm -rf var/$$d/$$t ; \
8690
done ; \
8791
done
8892

89-
.PHONY: composer-dump-autoload-dev
93+
.PHONY: composer-dump-autoload composer-dump-autoload-dev

0 commit comments

Comments
 (0)