Skip to content

Commit dfc1693

Browse files
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
1 parent 3a896f6 commit dfc1693

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,22 @@ case $distro_id in
1010
dnf install pkg-config make bats autoconf automake util-linux -y ;;
1111
*)
1212
apt-get update; apt-get full-upgrade -y
13-
apt-get install pkg-config make bats autoconf -y ;;
13+
apt-get install pkg-config make bats autoconf -y
14+
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+
;;
1417
esac
1518

1619
# Build the configure file
1720
make configure
1821

22+
case $distro_id in
23+
"ID=fedora")
24+
true ;;
25+
*)
26+
composer install --no-scripts ;;
27+
esac
28+
1929
# Install extra assert statements for bots
2030
cp submit/assert.bash .github/jobs/configure-checks/
2131

webapp/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,19 @@ composer-dump-autoload-dev:
4646
copy-bundle-assets:
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 public/bundles/nelmioapidoc
49+
-rm -rf public/bundles/nelmioapidoc/*
5050
mkdir -p public/bundles/nelmioapidoc
51-
cp -R vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
51+
cp -a vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
5252

5353
clean-l:
5454
-rm -rf public/bundles/nelmioapidoc
5555
-rm -f vendor/autoload_runtime.php
5656

57-
install-domserver:
57+
domserver-l:
5858
# This must be done first to install with the rest.
5959
$(MAKE) copy-bundle-assets
60+
61+
install-domserver:
6062
$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
6163
for d in bin config migrations public resources src templates tests vendor; do \
6264
$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \

0 commit comments

Comments
 (0)