Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary
run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src"
- name: Test with pytest
run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2
run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev pytest
- name: Test if pytest is removing all test objects
run: docker exec hashtopolis-server-dev python3 /var/www/html/ci/apiv2/htcli.py run delete-test-data
run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev python3 htcli.py run delete-test-data
- name: Show docker log files
if: ${{ always() }}
run: docker logs hashtopolis-server-dev
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,9 @@ RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \
RUN apt-get update \
&& apt-get install -y python3 python3-pip python3-requests python3-pytest

#TODO: Should source from ./ci/apiv2/requirements.txt
RUN pip3 install click click_log confidence pytest tuspy --break-system-packages
# install dependencies from ./ci/apiv2/requirements.txt
COPY ./ci/apiv2/requirements.txt /tmp/requirements.txt
RUN pip3 install -r /tmp/requirements.txt --break-system-packages

# Adding VSCode user and fixing permissions
RUN groupadd vscode && useradd -rm -d /var/www -s /bin/bash -g vscode -G www-data -u 1001 vscode \
Expand Down
Loading