Skip to content

Commit c8685b8

Browse files
vmcjMichael Vasseur
authored andcommitted
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.
1 parent b8441a8 commit c8685b8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
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

webapp/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public/bundles/nelmioapidoc:
5050
mkdir -p $@
5151
cp -a vendor/nelmio/api-doc-bundle/public/* $@
5252

53+
# -rm -rf public/bundles/nelmioapidoc
54+
# mkdir -p public/bundles/nelmioapidoc
55+
# cp -a vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
56+
5357
clean-l:
5458
-rm -rf public/bundles/nelmioapidoc
5559
-rm -f vendor/autoload_runtime.php

0 commit comments

Comments
 (0)