Skip to content

Commit 2ab5b3c

Browse files
committed
move composer update into dockerfile
1 parent 96a842b commit 2ab5b3c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/functional.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ jobs:
1414
uses: hoverkraft-tech/[email protected]
1515
with:
1616
compose-file: "./tools/docker-dev/docker-compose.yml"
17-
- name: Execute tests in the running services
18-
run: |
19-
docker compose exec -w '/var/www/unity-web-portal' web composer update
2017
- name: Execute tests in the running services
2118
run: |
2219
docker compose exec -w '/var/www/unity-web-portal' web ./vendor/bin/phpunit --testsuite=functional

tools/docker-dev/web/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ RUN sed -i '/memory_limit/c\memory_limit = -1' /etc/php/8.3/apache2/php.ini
3030
# Start apache2 server
3131
EXPOSE 80
3232

33-
CMD ["bash", "-c", "pushd /var/www/unity-web-portal/workers >/dev/null && echo 'updating LDAP cache...' && php ./update-ldap-cache.php && popd >/dev/null && apache2ctl -D FOREGROUND"]
33+
# normally composer deps are bind mounted, have to install when running in github action
34+
CMD ["bash", "-c", "(if [ ! -f vendor/autoload.php ]; then composer update; fi) && pushd /var/www/unity-web-portal/workers >/dev/null && echo 'updating LDAP cache...' && php ./update-ldap-cache.php && popd >/dev/null && apache2ctl -D FOREGROUND"]

0 commit comments

Comments
 (0)