Skip to content

Commit

Permalink
Keep the owner:group of the one downloading the tarball
Browse files Browse the repository at this point in the history
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
DOMjudge#2303 (comment)
for the reasoning behind this.
  • Loading branch information
vmcj authored and Michael Vasseur committed Oct 27, 2024
1 parent b8441a8 commit c8685b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .github/jobs/configure-checks/setup_configure_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ case $distro_id in
apt-get update; apt-get full-upgrade -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
;;
php-intl php-json php-mbstring php-mysql php-xml php-zip -y ;;
esac

# Build the configure file
Expand Down
4 changes: 4 additions & 0 deletions webapp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public/bundles/nelmioapidoc:
mkdir -p $@
cp -a vendor/nelmio/api-doc-bundle/public/* $@

# -rm -rf public/bundles/nelmioapidoc
# mkdir -p public/bundles/nelmioapidoc
# cp -a vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/

clean-l:
-rm -rf public/bundles/nelmioapidoc
-rm -f vendor/autoload_runtime.php
Expand Down

0 comments on commit c8685b8

Please sign in to comment.